Override uname in PATH for easier autoconf, update Origin fields to include saurik's full name, filter packages before passing to dpkg-scanpackages (to verify correct version is indexed), handle a few escaping mistakes in the make.sh directory logic, and re-enabled nls support during pkg:configure.

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

3 files changed, 28 insertions, 8 deletions

diff --git a/construct.sh b/construct.sh
index beb9ed809..534db09b5 100755
--- a/construct.sh
+++ b/construct.sh
@@ -1,33 +1,38 @@
 #!/bin/bash
 set -e
 shopt -s extglob nullglob
+PKG_BASE=$(pwd)
 PKG_REPO=/dat/web/apt.saurik.com
 PKG_OVER=${PKG_REPO}/indices/override.tangelo.main.gz
 PKG_PKGS=${PKG_REPO}/dists/tangelo/main/binary-darwin-arm/Packages
+rm -rf link
+mkdir link
 for package in data/!(*_); do
     PKG_NAME=$(basename "${package}")
-    echo "${PKG_NAME}" "$(cat "data/${PKG_NAME}/_metadata/priority")" "$(cat "data/${PKG_NAME}/_metadata/section")"
+    PKG_DATA="${PKG_BASE}/data/${PKG_NAME}"
+    echo "${PKG_NAME}" "$(cat "${PKG_DATA}/_metadata/priority")" "$(cat "${PKG_DATA}/_metadata/section")"
+    ln -s "../debs/${PKG_NAME}_$(cat "${PKG_DATA}/_metadata/version")-$(cat "${PKG_BASE}/stat/${PKG_NAME}/dest-ver")_darwin-arm.deb" link
 done | gzip -9c >"${PKG_OVER}"
-dpkg-scanpackages debs <(zcat "${PKG_OVER}") >"${PKG_PKGS}"
+dpkg-scanpackages link <(zcat "${PKG_OVER}") | sed -e 's/: link\//: debs\//' >"${PKG_PKGS}"
 gzip -c "${PKG_PKGS}" >"${PKG_PKGS}.gz"
 #rm -rf "${PKG_REPO}/debs"
 #cp -a debs "${PKG_REPO}"
 cd "${PKG_REPO}/dists/tangelo"
 
-export PKG_RVSN=8
+export PKG_RVSN=13
 
 cat >main/binary-darwin-arm/Release <<EOF
 Archive: stable
 Version: 1.0r${PKG_RVSN}
 Component: main
-Origin: saurik
+Origin: Jay Freeman (saurik)
 Label: Telesphoreo
 Architecture: darwin-arm
 EOF
 
 {
     cat <<EOF
-Origin: saurik
+Origin: Jay Freeman (saurik)
 Label: Telesphoreo
 Suite: stable
 Version: 1.0r${PKG_RVSN}
diff --git a/make.sh b/make.sh
index 2e1b8aa5d..bf7212d54 100755
--- a/make.sh
+++ b/make.sh
@@ -11,6 +11,7 @@ export PKG_MAKE=$0
 export PKG_NAME=${1%_}
 
 export PKG_BASE=$(realpath "$(dirname "$0")")
+export PATH=${PKG_BASE}/util:$PATH
 . "${PKG_BASE}/helper.sh"
 
 for dep in "${PKG_DEPS[@]}"; do
@@ -42,6 +43,10 @@ mkdir "${PKG_DEST}"
 rm -rf "${PKG_WORK}"
 mkdir "${PKG_WORK}"
 
+function PKG_DATA_() {
+    echo "${PKG_BASE}/data/$1"
+}
+
 function PKG_WORK_() {
     echo "${PKG_BASE}/work/$1"
 }
@@ -78,7 +83,6 @@ function pkg:configure() {
     PKG_CONFIG_PATH=${PKG_ROOT}/usr/lib/pkgconfig \
     "${PKG_CONF}" \
         --host=arm-apple-darwin \
-        --disable-nls \
         --enable-static=no \
         --enable-shared=yes \
         --prefix=/usr \
@@ -94,7 +98,7 @@ function pkg_ {
     case "${1:0:1}" in
         (/) echo "${PKG_DEST}$1";;
         (%) echo "${PKG_DATA}${1:1}";;
-        (*) echo "$1";;
+        (*) echo -"$1" | sed -e 's/^.//';;
     esac
 }
 
@@ -103,7 +107,7 @@ function pkg: {
     declare argc=$#
 
     for ((i=0; $i != $argc; ++i)); do
-        argv[$i]=$(pkg_ $1)
+        argv[$i]=$(pkg_ "$1")
         shift
     done
 
diff --git a/util/uname b/util/uname
new file mode 100755
index 000000000..adc4d23ab
--- /dev/null
+++ b/util/uname
@@ -0,0 +1,11 @@
+#!/bin/bash
+OPTIND=1
+while getopts mnrsv OPTKEY; do
+    case $OPTKEY in
+        (m) echo 'iPhone1,1';;
+        (n) echo 'transponder';;
+        (r) echo '9.0.0d1';;
+        (s) echo 'Darwin';;
+        (v) echo 'Darwin Kernel Version 9.0.0d1: Wed Sep 19 00:08:43 PDT 2007; root:xnu-933.0.0.203.obj~21/RELEASE_ARM_S5L8900XRB';;
+    esac
+done