Fixed some dependencies, removed mDNS fix for 2.0, and factored for multi-arch support.

git-svn-id: http://svn.telesphoreo.org/trunk@218 514c082c-b64e-11dc-b46d-3d985efe055d

1 files changed, 16 insertions, 12 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index beb858a06..66e37e8ff 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,22 +3,26 @@ set -e
 shopt -s extglob nullglob
 
 export PKG_BASE=$(realpath "$(dirname "$0")")
+source "${PKG_BASE}/architect.sh"
+
 export PKG_BOOT=${PKG_BASE}/Packager
-export PKG_TARG=arm-apple-darwin
 
 rm -rf "${PKG_BOOT}"
 svn export "${PKG_BASE}/over" "${PKG_BOOT}"
 
-arm-apple-darwin-gcc -o "${PKG_BOOT}/usr/libexec/cydia_/godmode" "${PKG_BASE}/util/godmode.c"
-arm-apple-darwin-gcc -o "${PKG_BOOT}/usr/libexec/cydia_/symlink" "${PKG_BASE}/util/symlink.c"
+"${PKG_TARG}-gcc" -o "${PKG_BOOT}/usr/libexec/cydia_/godmode" "${PKG_BASE}/util/godmode.c"
+"${PKG_TARG}-gcc" -o "${PKG_BOOT}/usr/libexec/cydia_/symlink" "${PKG_BASE}/util/symlink.c"
 chmod +s "${PKG_BOOT}/usr/libexec/cydia_"/{godmode,symlink}
 
 mkdir -p "${PKG_BOOT}/var/lib/dpkg/info"
 
-PKG_REQS=(adv-cmds base bash bigboss coreutils cydia gawk grep inetutils iphonesurge less libarmfp modmyifone nano network-cmds rsync saurik sed shell-cmds ste system-cmds unzip zip)
+PKG_REQS=(adv-cmds apt base bash bigboss coreutils cydia gawk grep inetutils iphonesurge less libarmfp libgcc modmyifone nano network-cmds nvi rsync saurik sed shell-cmds ste system-cmds tar unzip zip)
 
 cd "${PKG_BASE}/data"
-PKG_REQS=($(find -L "${PKG_REQS[@]}" | while read -r line; do realpath "${line}"; done | grep "/apl/tel/data/[^/]*$" | sed -e 's/.*\///' | sort -u))
+PKG_REQS=($({
+    echo "${PKG_REQS[@]}" | tr ' ' $'\n'
+    find -L "${PKG_REQS[@]}" -name '*.dep' | sed -e 's/.*\/\([^\/]*\)\.dep/\1/'
+} | sort -u))
 
 for PKG_NAME in "${PKG_REQS[@]}"; do
     PKG_NAME=${PKG_NAME%/_metadata/priority}
@@ -26,7 +30,7 @@ for PKG_NAME in "${PKG_REQS[@]}"; do
     source "${PKG_BASE}/helper.sh"
 
     rm -rf "${PKG_BASE}/temp"
-    dpkg -x "${PKG_BASE}/debs/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_darwin-arm.deb" "${PKG_BASE}/temp"
+    dpkg -x "${PKG_BASE}/debs/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb" "${PKG_BASE}/temp"
 
     echo "merging ${PKG_NAME}..."
     cp -a "${PKG_BASE}/temp"/* "${PKG_BOOT}"
@@ -42,8 +46,8 @@ done
 
 cd "${PKG_BOOT}"
 
-rm -f ../Packager.tgz
-tar -zcvf ../Packager.tgz *
+rm -f "../Packager_${PKG_ARCH}.tgz"
+tar -zcvf "../Packager_${PKG_ARCH}.tgz" *
 
 cp -a bin/bash usr/libexec/cydia_
 cp -a bin/chmod usr/libexec/cydia_
@@ -64,12 +68,12 @@ cp -a usr/lib/libintl.8.0.2.dylib usr/libexec/cydia_
 cp -a usr/lib/libncurses.5.dylib usr/libexec/cydia_
 cp -a usr/lib/libreadline.5.2.dylib usr/libexec/cydia_
 
-rm -f ../Packager.xml
+rm -f "../Packager_${PKG_ARCH}.xml"
 find * -type l -print -o -name "terminfo" -prune | while read -r link; do
     echo "<array><string>Exec</string><string>/usr/libexec/cydia_/symlink $(readlink "${link}") /${link}</string></array>"
     rm -f "${link}"
-done >>../Packager.xml
+done >>"../Packager_${PKG_ARCH}.xml"
 
-rm -f ../Packager.zip
-zip -qry ../Packager.zip *
+rm -f "../Packager_${PKG_ARCH}.zip"
+zip -qry "../Packager_${PKG_ARCH}.zip" *
 rm -rf "${PKG_BOOT}"