From 286b38eda5878132276082c569a0cd4f68ffd947 Mon Sep 17 00:00:00 2001 From: sin Date: Tue, 17 Sep 2013 11:07:15 +0100 Subject: [PATCH] Disable building shared libs and add prepare-root --- cross-scripts/libevent-2.0.21 | 2 +- cross-scripts/musl-0.9.13 | 2 +- prepare-root | 9 +++++++++ stage0 | 13 +------------ 4 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 prepare-root diff --git a/cross-scripts/libevent-2.0.21 b/cross-scripts/libevent-2.0.21 index ec74f55..a726079 100644 --- a/cross-scripts/libevent-2.0.21 +++ b/cross-scripts/libevent-2.0.21 @@ -12,7 +12,7 @@ unpack() { build() { pushd src/libevent-2.0.21-stable - CC=musl-gcc ./configure --prefix=$top/cross + CC=musl-gcc ./configure --prefix=$top/cross --disable-shared make CC=musl-gcc -j$nprocs popd } diff --git a/cross-scripts/musl-0.9.13 b/cross-scripts/musl-0.9.13 index 1f6beae..ee45ae7 100644 --- a/cross-scripts/musl-0.9.13 +++ b/cross-scripts/musl-0.9.13 @@ -12,7 +12,7 @@ unpack() { build() { pushd src/musl-0.9.13 - ./configure --prefix=$top/cross --syslibdir=$top/cross/lib + ./configure --prefix=$top/cross --syslibdir=$top/cross/lib --disable-shared make -j$nprocs popd } diff --git a/prepare-root b/prepare-root new file mode 100644 index 0000000..70b4b08 --- /dev/null +++ b/prepare-root @@ -0,0 +1,9 @@ +mkdir -p src cross +mkdir -p $root/{bin,boot,dev,etc,home,root,lib,var,share,tmp,sys,proc} +mkdir -p $root/dev/shm +mkdir -p $root/share/{doc,man} +mkdir -p $root/var/run +cd $root +ln -s . usr +ln -s bin sbin +cd - diff --git a/stage0 b/stage0 index ef38c7c..c64765f 100755 --- a/stage0 +++ b/stage0 @@ -8,18 +8,7 @@ mirror=http://dl.2f30.org/morpheus-pkgs export top root nprocs mirror ./clean -# Create directory hierarchy -mkdir -p src cross -mkdir -p $root/{bin,boot,dev,etc,home,root,lib,var,share,tmp,sys,proc} -mkdir -p $root/dev/shm -mkdir -p $root/share/{doc,man} -mkdir -p $root/var/run -pushd $root/ -if [ -e sbin ]; then - unlink sbin -fi -ln -s /bin sbin -popd +. ./prepare-root ./build cross-scripts/musl-0.9.13 ./build cross-scripts/libevent-2.0.21