morpheus

suckless linux distro
git clone git@git.2f30.org/morpheus.git
Log | Files | Refs | Submodules | README | LICENSE

commit 6cafdd34d0a5a51b32b75e5383c52acfe6966971
parent 59466c4a6e90c7bed413494b52a23179d541b6dc
Author: sin <sin@2f30.org>
Date:   Thu, 26 Sep 2013 20:38:43 +0100

Do not use cross/ just put everything inside the rootfs

Diffstat:
Mclean | 2+-
Rpkgs/crossmusl -> cross-scripts/crossmusl | 0
Dcross-scripts/musl | 14--------------
Mpkgbuild | 2+-
Mprepare-env | 4++--
Mprepare-root | 2+-
Mstage0 | 6+++---
7 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/clean b/clean @@ -1,3 +1,3 @@ #!/bin/sh -rm -rf root src cross morpheus.log +rm -rf root src morpheus.log diff --git a/pkgs/crossmusl b/cross-scripts/crossmusl diff --git a/cross-scripts/musl b/cross-scripts/musl @@ -1,14 +0,0 @@ -url=$mirror/crossx86-x86_64-linux-musl-0.9.11.tar.xz - -fetch() { - wget -c $url -O src/crossx86-x86_64-linux-musl-0.9.11.tar.xz -} - -install() { - tar xJf src/crossx86-x86_64-linux-musl-0.9.11.tar.xz -C $top/cross - mv $libcroot/lib64/* $libcroot/lib - sed -i 's/libdir=.*//g' $libcroot/lib/libstdc++.la - sed -i 's/libdir=.*//g' $libcroot/lib/libsupc++.la - echo "libdir='$libcroot/lib'" >> $libcroot/lib/libstdc++.la - echo "libdir='$libcroot/lib'" >> $libcroot/lib/libsupc++.la -} diff --git a/pkgbuild b/pkgbuild @@ -13,7 +13,7 @@ if [ $(uname -m) != $arch ]; then fi . ./prepare-root -mkdir -p src cross +mkdir -p src while [ $# -gt 0 ]; do ./build "$1" diff --git a/prepare-env b/prepare-env @@ -1,11 +1,11 @@ top=$(pwd) root=$top/root -libcroot=$top/cross/x86_64-linux-musl/x86_64-linux-musl +libcroot=$root/opt/cross/x86_64-linux-musl/x86_64-linux-musl nprocs=4 arch=x86_64 version=0.0 mirror=http://dl.2f30.org/morpheus-pkgs/$arch/$version export top root libcroot nprocs mirror -PATH=$top/cross/x86_64-linux-musl/bin:$PATH +PATH=$root/opt/cross/x86_64-linux-musl/bin:$PATH export PATH diff --git a/prepare-root b/prepare-root @@ -1,6 +1,6 @@ mkdir -p $root cd $root -mkdir -p boot bin dev etc home opt proc root share sys tmp var +mkdir -p boot bin dev etc home opt proc root share src sys tmp var mkdir -p opt/cross share/doc share/man var/empty var/log var/run ln -sf . usr ln -sf bin sbin diff --git a/stage0 b/stage0 @@ -10,12 +10,12 @@ if [ $(uname -m) != $arch ]; then exit 1 fi -rm -rf root cross morpheus.log +rm -rf morpheus.log . ./prepare-root -mkdir -p src cross +mkdir -p src # Fetch and install our musl cross-compiler -./build cross-scripts/musl +./build cross-scripts/crossmusl installed_deps= build_pkg_dep() {