From 81f18a212ffb1ef43e14d36a5498d1c8a5239c46 Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Tue, 17 Sep 2013 15:26:52 +0100
Subject: [PATCH] Cleanup build system

---
 cross-scripts/{curl-7.32.0 => curl}           |  0
 cross-scripts/{libevent-2.0.21 => libevent}   |  0
 cross-scripts/{libsigc++-2.3.1 => libsigc++}  |  0
 .../{libtorrent-0.13.3 => libtorrent}         |  0
 cross-scripts/{musl-0.9.13 => musl}           |  0
 cross-scripts/{ncurses-5.9 => ncurses}        |  0
 cross-scripts/{zlib-1.2.8 => zlib}            |  0
 pkgbuild                                      |  9 +-----
 prepare-env                                   |  8 +++++
 repack                                        |  3 +-
 stage0                                        | 29 +++++++------------
 11 files changed, 20 insertions(+), 29 deletions(-)
 rename cross-scripts/{curl-7.32.0 => curl} (100%)
 rename cross-scripts/{libevent-2.0.21 => libevent} (100%)
 rename cross-scripts/{libsigc++-2.3.1 => libsigc++} (100%)
 rename cross-scripts/{libtorrent-0.13.3 => libtorrent} (100%)
 rename cross-scripts/{musl-0.9.13 => musl} (100%)
 rename cross-scripts/{ncurses-5.9 => ncurses} (100%)
 rename cross-scripts/{zlib-1.2.8 => zlib} (100%)
 create mode 100644 prepare-env

diff --git a/cross-scripts/curl-7.32.0 b/cross-scripts/curl
similarity index 100%
rename from cross-scripts/curl-7.32.0
rename to cross-scripts/curl
diff --git a/cross-scripts/libevent-2.0.21 b/cross-scripts/libevent
similarity index 100%
rename from cross-scripts/libevent-2.0.21
rename to cross-scripts/libevent
diff --git a/cross-scripts/libsigc++-2.3.1 b/cross-scripts/libsigc++
similarity index 100%
rename from cross-scripts/libsigc++-2.3.1
rename to cross-scripts/libsigc++
diff --git a/cross-scripts/libtorrent-0.13.3 b/cross-scripts/libtorrent
similarity index 100%
rename from cross-scripts/libtorrent-0.13.3
rename to cross-scripts/libtorrent
diff --git a/cross-scripts/musl-0.9.13 b/cross-scripts/musl
similarity index 100%
rename from cross-scripts/musl-0.9.13
rename to cross-scripts/musl
diff --git a/cross-scripts/ncurses-5.9 b/cross-scripts/ncurses
similarity index 100%
rename from cross-scripts/ncurses-5.9
rename to cross-scripts/ncurses
diff --git a/cross-scripts/zlib-1.2.8 b/cross-scripts/zlib
similarity index 100%
rename from cross-scripts/zlib-1.2.8
rename to cross-scripts/zlib
diff --git a/pkgbuild b/pkgbuild
index f46e2fa..8907fbb 100755
--- 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
new file mode 100644
index 0000000..73abfad
--- /dev/null
+++ 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
index 889911a..38d1745 100755
--- 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
index 2a6702c..a56c355 100755
--- 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
+mkdir -p src cross
 
-PATH=$top/cross/bin:$PATH
-export PATH
-
-# 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)