morpheus

commit 81f18a212ffb1ef43e14d36a5498d1c8a5239c46
parent 96ab54a4effadf9512681764a12bda8e7169e521
Author: sin <sin@2f30.org>
Date:   Tue, 17 Sep 2013 15:26:52 +0100

Cleanup build system

Diffstat:
R
cross-scripts/curl-7.32.0 -> cross-scripts/curl
 | 
0

R
cross-scripts/libevent-2.0.21 -> cross-scripts/libevent
 | 
0

R
cross-scripts/libsigc++-2.3.1 -> cross-scripts/libsigc++
 | 
0

R
cross-scripts/libtorrent-0.13.3 -> cross-scripts/libtorrent
 | 
0

R
cross-scripts/musl-0.9.13 -> cross-scripts/musl
 | 
0

R
cross-scripts/ncurses-5.9 -> cross-scripts/ncurses
 | 
0

R
cross-scripts/zlib-1.2.8 -> cross-scripts/zlib
 | 
0

M
pkgbuild
 | 
9
+--------
A
prepare-env
 | 
8
++++++++
M
repack
 | 
3
+--
M
stage0
 | 
29
++++++++++-------------------

11 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/cross-scripts/curl-7.32.0 b/cross-scripts/curl
diff --git a/cross-scripts/libevent-2.0.21 b/cross-scripts/libevent
diff --git a/cross-scripts/libsigc++-2.3.1 b/cross-scripts/libsigc++
diff --git a/cross-scripts/libtorrent-0.13.3 b/cross-scripts/libtorrent
diff --git a/cross-scripts/musl-0.9.13 b/cross-scripts/musl
diff --git a/cross-scripts/ncurses-5.9 b/cross-scripts/ncurses
diff --git a/cross-scripts/zlib-1.2.8 b/cross-scripts/zlib
diff --git a/pkgbuild b/pkgbuild
@@ -5,13 +5,6 @@ if test -z "$1"; then
 	exit 1
 fi
 
-# Export important variables for the build scripts
-top=$(pwd)
-root=$top/root
-mirror=http://dl.2f30.org/morpheus-pkgs
-export top root mirror
-
-PATH=$top/cross/bin:$PATH
-export PATH
+. ./prepare-env
 
 ./build "$1"
diff --git a/prepare-env b/prepare-env
@@ -0,0 +1,8 @@
+top=$(pwd)
+root=$top/root
+nprocs=4
+mirror=http://dl.2f30.org/morpheus-pkgs
+export top root nprocs mirror
+
+PATH=$top/cross/bin:$PATH
+export PATH
diff --git a/repack b/repack
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-top=$(pwd)
-root=$top/root
+. ./prepare-env
 
 pushd $root && find . | cpio --quiet -H newc -o | gzip -9 -n > ../morpheus.img && popd
diff --git a/stage0 b/stage0
@@ -1,28 +1,19 @@
 #!/bin/sh
 
-# Export important variables for the build scripts
-top=$(pwd)
-root=$top/root
-nprocs=4
-mirror=http://dl.2f30.org/morpheus-pkgs
-export top root nprocs mirror
-
 ./clean
-mkdir -p src cross
+. ./prepare-env
 . ./prepare-root
 
-./build cross-scripts/musl-0.9.13
-
-PATH=$top/cross/bin:$PATH
-export PATH
+mkdir -p src cross
 
-# These are ordered
-./build cross-scripts/libevent-2.0.21
-./build cross-scripts/ncurses-5.9
-./build cross-scripts/zlib-1.2.8
-# ./build cross-scripts/libsigc++-2.3.1
-# ./build cross-scripts/curl-7.32.0
-# ./build cross-scripts/libtorrent-0.13.3
+# Deps list
+./build cross-scripts/musl
+./build cross-scripts/libevent
+./build cross-scripts/ncurses
+./build cross-scripts/zlib
+#./build cross-scripts/libsigc++
+#./build cross-scripts/curl
+#./build cross-scripts/libtorrent
 
 # Build stage0 packages
 pkglist=$(ls pkgs)