Changeset 647

Timestamp:

08/09/09 02:50:34 (1 year ago)

Author:

saurik

Message:

jlanger failed to build my zsh.

Location:

trunk

Files:

• bootstrap.sh (modified) (4 diffs)
• construct.sh (modified) (4 diffs)
• control.sh (modified) (2 diffs)
• exec.sh (modified) (2 diffs)
• folders.sh (modified) (2 diffs)
• helper.sh (modified) (2 diffs)
• make.sh (modified) (9 diffs)
• package.sh (modified) (2 diffs)
• remake.sh (added)

trunk/bootstrap.sh

@@ -13 +13 @@
 mkdir -p "${PKG_BOOT}/var/lib/dpkg/info"
 
-PKG_REQS=(adv-cmds apt base bash coreutils cydia cydia-sources grep inetutils less libgcc nano network-cmds sed shell-cmds system-cmds tar unzip)
+PKG_REQS=(apt7 base cydia cydia-sources essential openssh pam-modules profile.d)
+PKG_REQS=(base cydia cydia-sources essential pam-modules profile.d)
 
 cd "${PKG_BASE}/data"
 PKG_REQS=($({
     echo "${PKG_REQS[@]}" | tr ' ' $'\n'
-    find -L "${PKG_REQS[@]}" -name '*.dep' | sed -e 's/.*\/\([^\/]*\)\.dep/\1/'
+    find -L "${PKG_REQS[@]}" -name '*.dep' | grep -v '/_[^/]*\.dep' | sed -e 's/.*\/\([^\/]*\)\.dep/\1/'
 } | sort -u))
 
@@ -54 +55 @@
 PKG_RSLT="${PKG_BASE}/rslt"
 mkdir -p "${PKG_RSLT}"
-
-rm -f "${PKG_RSLT}/Manual_${PKG_ARCH}.tgz"
-tar -zcf "${PKG_RSLT}/Manual_${PKG_ARCH}.tgz" *
 
 rm -rf "${PKG_RSLT}/CydiaInstaller.bundle"
@@ -139 +137 @@
 tar -zcf "${PKG_RSLT}/Pwnage_${PKG_ARCH}.tgz" -C "${PKG_RSLT}" CydiaInstaller.bundle
 
+function stash() {
+    src=$1
+    dst=var/stash/${src##*/}
+    mv "${src}" "${dst}"
+    dst=${src//+([A-Za-z])/..}/${dst}
+    ln -s "${dst#../}" "${src}"
+}
+
+mkdir -p var/stash
+mkdir -p usr/include
+
+mv -v usr/lib/_ncurses/* usr/lib
+rmdir usr/lib/_ncurses
+ln -s /usr/lib usr/lib/_ncurses
+
+#stash usr/share/gettext
+
+rm -f "${PKG_RSLT}/Manual_${PKG_ARCH}.tgz"
+tar -zcf "${PKG_RSLT}/Manual_${PKG_ARCH}.tgz" *
+
 rm -f "${PKG_RSLT}/Manual_${PKG_ARCH}.zip"
 zip -qry "${PKG_RSLT}/Manual_${PKG_ARCH}.zip" *
@@ -176 +194 @@
 fi
 
-rm -rf "${PKG_BOOT}"
+#rm -rf "${PKG_BOOT}"

trunk/construct.sh

@@ -5 +5 @@
 PKG_BASE=$(dirname "$(realpath "$0")")
 cd "${PKG_BASE}"
-PKG_RVSN=280
+PKG_RVSN=282
 
-PKG_REPO=/dat/web/apt.saurik.com
-PKG_OVER=${PKG_REPO}/indices/override.tangelo.main.gz
+PKG_REPO=/dat/web/beta.apt.saurik.com
 
 for PKG_ARCH in "${PKG_BASE}/arch"/*; do
@@ -14 +13 @@
     echo "scanning ${PKG_ARCH}"
 
-    PKG_PKGS=${PKG_REPO}/dists/tangelo/main/binary-${PKG_ARCH}/Packages
+    PKG_DCBF=${PKG_REPO}/dists/tangelo/main/binary-${PKG_ARCH}
+    mkdir -p "${PKG_DCBF}"
+    PKG_PKGS=${PKG_DCBF}/Packages
 
     rm -rf "${PKG_BASE}/link"
     mkdir "${PKG_BASE}/link"
+
     for package in "${PKG_BASE}/data"/!(*_); do
         PKG_NAME=$(basename "${package}")
+
+        # XXX: add to above filter
+        if [[ ${PKG_NAME} == _* ]]; then
+            continue
+        fi
+
         PKG_DATA="${PKG_BASE}/data/${PKG_NAME}"
+        PKG_STAT="${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}"
         PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
+
+        if [[ -e ${PKG_STAT}/fail ]]; then
+            continue
+        fi
+
         echo "${PKG_NAME}" "${PKG_PRIO#+}" "$(cat "${PKG_DATA}/_metadata/section")"
 
         PKG_FILE=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}/dest-ver
         if [[ -e ${PKG_FILE} ]]; then
-            PKG_FILE=${PKG_BASE}/debs/${PKG_NAME}_$(cat "${PKG_DATA}/_metadata/version")-$(cat "${PKG_FILE}")_${PKG_ARCH}.deb
-            if [[ -e ${PKG_FILE} ]]; then
+            PKG_REAL=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}/real-ver
+            if [[ -e ${PKG_REAL} ]]; then
+                PKG_RVER=$(cat "${PKG_REAL}")
+            else
+                PKG_RVER=$(cat "${PKG_STAT}/data-ver")-$(cat "${PKG_FILE}")
+            fi
+
+            PKG_FILE=${PKG_BASE}/debs/${PKG_NAME}_${PKG_RVER}_${PKG_ARCH}.deb
+            if [[ -e ${PKG_FILE} && ! -e "${PKG_STAT}/exclude" ]]; then
                 ln -s "${PKG_FILE}" "${PKG_BASE}/link"
                 echo "${PKG_FILE}"
@@ -34 +55 @@
     done >"${PKG_BASE}/overrides.txt"
 
-    dpkg-scanpackages link "${PKG_BASE}/overrides.txt" | sed -e 's/: link\//: debs\//' >"${PKG_PKGS}"
+    for deb in "${PKG_BASE}/xtra/${PKG_ARCH}"/*.deb; do
+        ln -s "$(readlink -f "${deb}")" "${PKG_BASE}/link"
+    done
+
+    dpkg-scanpackages -m link "${PKG_BASE}/overrides.txt" | sed -e 's/: link\//: debs\//' | while IFS= read -r line; do
+        if [[ ${line} == '' ]]; then
+            PKG_TAGS=$(cat "${PKG_BASE}/tags/${PKG_NAME}" 2>/dev/null || true)
+            if [[ -z ${PKG_TAGS} ]]; then
+                PKG_TAGS=$(cat "${PKG_BASE}/data/${PKG_NAME}/_metadata/tags" 2>/dev/null || true)
+            fi
+            PKG_ROLE="${PKG_BASE}/data/${PKG_NAME}/_metadata/role"
+            if [[ -n ${PKG_TAGS} || -e ${PKG_ROLE} ]]; then
+                echo -n "Tag: "
+                if [[ -n ${PKG_TAGS} ]]; then
+                    echo -n "${PKG_TAGS}"
+                fi
+                if [[ -n ${PKG_TAGS} && -e ${PKG_ROLE} ]]; then
+                    echo -n ", "
+                fi
+                if [[ -e ${PKG_ROLE} ]]; then
+                    echo -n "role::$(cat "${PKG_ROLE}")"
+                fi
+                echo
+            fi
+        elif [[ ${line} == Package:* ]]; then
+            PKG_NAME=${line#Package: }
+        fi
+
+        echo "${line}"
+    done >"${PKG_PKGS}"
+
+    if [[ ${PKG_ARCH} == "iphoneos-arm" ]]; then
+        dpkg-scanpackages paid >>"${PKG_PKGS}"
+    fi
+
     rm -f "${PKG_BASE}/overrides.txt"
+done
 
-    gzip -c "${PKG_PKGS}" >"${PKG_PKGS}.gz"
+for PKG_ARCH in "${PKG_BASE}/arch"/*; do
+    PKG_ARCH=$(basename "${PKG_ARCH}")
+    PKG_PKGS=${PKG_REPO}/dists/tangelo/main/binary-${PKG_ARCH}/Packages
+    bzip2 -c "${PKG_PKGS}" >"${PKG_PKGS}.bz2"
 done
 
@@ -44 +103 @@
 {
     cat <<EOF
-Origin: Jay Freeman (saurik)
-Label: Telesphoreo
+Origin: Telesphoreo Tangelo
+Label: Cydia/Telesphoreo
 Suite: stable
 Version: 1.0r${PKG_RVSN}
-Codename: tangelo
+Codename: tangelo-3.7
 Architectures:$(for PKG_ARCH in "${PKG_BASE}/arch"/*; do echo -n " $(basename "${PKG_ARCH}")"; done)
 Components: main
-Description: Telesphoreo Tangelo 1.0r${PKG_RVSN}
+Description: Distribution of Unix Software for iPhoneOS 3
+Support: http://cydia.saurik.com/support/*
 MD5Sum:
 EOF

trunk/control.sh

@@ -16 +16 @@
 EOF
 
-if [[ ${PKG_PRIO} == required || ${PKG_PRIO} == +* ]]; then
+if [[ ${PKG_PRIO} == +* ]]; then
     cat <<EOF
 Essential: yes
@@ -62 +62 @@
 fi
 
-unset comma
-for dep in "${PKG_DEPS[@]}"; do
-    if [[ ${comma+@} == @ ]]; then
-        echo -n ","
-    else
-        echo -n "Depends:"
-        comma=
+if [[ -e ${PKG_DATA}/_metadata/predepends_ ]]; then
+    echo "Pre-Depends: $(cat "${PKG_DATA}/_metadata/predepends_")"
+else
+    unset comma
+
+    if [[ ${PKG_ZLIB} == lzma ]]; then
+        if [[ ${comma+@} == @ ]]; then
+            echo -n ","
+        else
+            echo -n "Pre-Depends:"
+            comma=
+        fi
+
+        echo -n " dpkg (>= 1.14.25-8)"
     fi
 
-    echo -n " $(basename "${dep}" .dep)"
-    
-    ver=${PKG_DATA}/_metadata/${dep%.dep}.ver.${PKG_ARCH}
-    if [[ -e "${ver}" ]]; then
-        echo -n " (>= $(cat "${ver}"))"
-    fi
-done
+    if [[ -e ${PKG_DATA}/_metadata/predepends ]]; then
+        if [[ ${comma+@} == @ ]]; then
+            echo -n ","
+        else
+            echo -n "Pre-Depends:"
+            comma=
+        fi
 
-if [[ -e ${PKG_DATA}/_metadata/depends ]]; then
-    if [[ ${comma+@} == @ ]]; then
-        echo -n ","
-    else
-        echo -n "Depends:"
-        comma=
+        echo -n " $(cat "${PKG_DATA}/_metadata/predepends")"
     fi
 
-    echo -n " $(cat "${PKG_DATA}/_metadata/depends")"
+    if [[ ${comma+@} == @ ]]; then
+        echo
+    fi
 fi
 
-if [[ ${comma+@} == @ ]]; then
-    echo
+if [[ ! -e ${PKG_DATA}/_metadata/depends_ ]]; then
+    unset comma
+    for dep in "${PKG_DEPS[@]}"; do
+        if [[ ${dep} == _* ]]; then
+            continue
+        fi
+
+        if [[ ${comma+@} == @ ]]; then
+            echo -n ","
+        else
+            echo -n "Depends:"
+            comma=
+        fi
+
+        echo -n " $(basename "${dep}" .dep)"
+        
+        ver=${PKG_DATA}/_metadata/${dep%.dep}.ver.${PKG_ARCH}
+        if [[ -e "${ver}" ]]; then
+            echo -n " (>= $(cat "${ver}"))"
+        fi
+    done
+
+    if [[ -e ${PKG_DATA}/_metadata/depends ]]; then
+        if [[ ${comma+@} == @ ]]; then
+            echo -n ","
+        else
+            echo -n "Depends:"
+            comma=
+        fi
+
+        echo -n " $(cat "${PKG_DATA}/_metadata/depends")"
+    fi
+
+    if [[ ${comma+@} == @ ]]; then
+        echo
+    fi
+elif [[ -s ${PKG_DATA}/_metadata/depends_ ]]; then
+    echo "Depends: $(cat "${PKG_DATA}/_metadata/depends_")"
 fi
 

trunk/exec.sh

@@ -29 +29 @@
     #DEP_NAME=$(basename "${dep}" .dep)
     DEP_NAME=${dep}
+    DEP_MORE=$(PKG_MORE_ "${DEP_NAME}")
     DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
     PKG_PATH=${PKG_PATH}:${DEP_DEST}
@@ -38 +39 @@
     if [[ -d ${DEP_DEST}${PKG_TAPF}/lib ]]; then
         PKG_LIBS=${DEP_DEST}${PKG_TAPF}/lib:${PKG_LIBS}
+    fi
+
+    if [[ -d ${DEP_MORE}${PKG_TAPF}/lib ]]; then
+        PKG_LIBS=${DEP_MORE}${PKG_TAPF}/lib:${PKG_LIBS}
     fi
 

trunk/folders.sh

@@ -13 +13 @@
 export -f PKG_WORK_
 
+function PKG_MORE_() {
+    echo "${PKG_BASE}/more/${PKG_ARCH}/$1"
+}
+
 function PKG_DEST_() {
     echo "${PKG_BASE}/dest/${PKG_ARCH}/$1"
@@ -22 +26 @@
     case "${1:0:1}" in
         (/) echo "${PKG_DEST}$1";;
+        (@) echo "${PKG_MORE}${1:1}";;
         (%) echo "${PKG_DATA}${1:1}";;
         (*) echo -"$1" | sed -e 's/^.//';;

trunk/helper.sh

@@ -9 +9 @@
 
 if [[ ${PKG_NAME} != @(-|:*) ]]; then
+    export PKG_MORE=$(PKG_MORE_ "${PKG_NAME}")
     export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}")
     export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}")
@@ -15 +16 @@
     export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}
     export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_))
-    export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version")
-    export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
     export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null)
+
+    if [[ -e "${PKG_DATA}/_metadata/zlib" ]]; then
+        export PKG_ZLIB=$(cat "${PKG_DATA}/_metadata/zlib")
+    else
+        export PKG_ZLIB=lzma
+    fi
+
+    if [[ -e "${PKG_DATA}/_metadata/version" ]]; then
+        export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version")
+    fi
+
+    if [[ -e "${PKG_DATA}/_metadata/priority" ]]; then
+        export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
+    fi
 
     if [[ ! -e ${PKG_DATA} ]]; then

trunk/make.sh

@@ -24 +24 @@
 export CODESIGN_ALLOCATE=$(which arm-apple-darwin9-codesign_allocate)
 
-for DEP_NAME in "${PKG_DEPS[@]}"; do
-    "${PKG_MAKE}" "${DEP_NAME}"
-done
+#for DEP_NAME in "${PKG_DEPS[@]}"; do
+#    "${PKG_MAKE}" "${DEP_NAME}"
+#done
 
 export PKG_HASH=$({
@@ -33 +33 @@
     for DEP_NAME in "${PKG_DEPS[@]}"; do
         "${PKG_BASE}"/util/catdir.sh "$(PKG_DEST_ "${DEP_NAME}")"
+        DEP_MORE="$(PKG_MORE_ "${DEP_NAME}")"
+        if [[ -d ${DEP_MORE} ]]; then
+            "${PKG_BASE}"/util/catdir.sh "${DEP_MORE}"
+        fi
     done
 } | md5sum | cut -d ' ' -f 1)
@@ -46 +50 @@
 rm -f "${PKG_STAT}/data-md5"
 
+rm -rf "${PKG_MORE}"
+mkdir -p "${PKG_MORE}"
+
 rm -rf "${PKG_DEST}"
 mkdir -p "${PKG_DEST}"
@@ -57 +64 @@
 
     for diff in "${PKG_DATA}"/*.diff; do
-        if [[ ${diff} == */_*.diff ]]; then
+        if [[ ${diff} =~ .*/_[^/]*.diff$ ]]; then
             continue;
         fi
@@ -116 +123 @@
     PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
     ac_cv_prog_cc_g=no ac_cv_prog_cxx_g=no \
-    "${PKG_CONF}" \
+    cfg=("${PKG_CONF}" \
+        ac_cv_prog_cc_g=no ac_cv_prog_cxx_g=no \
         --build=x86_64-unknown-linux-gnu \
         --host="${PKG_TARG}" \
@@ -123 +131 @@
         --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix") \
         --localstatedir="/var/cache/${PKG_NAME}" \
-        "$@"
+        "$@")
+    echo "${cfg[@]}"
+    "${cfg[@]}"
 }
 
 export -f pkg:configure
+
+function pkg:make() {
+    make AR="${PKG_TARG}-ar" CFLAGS='-O2 -mthumb'
+}
+
+export -f pkg:make
 
 function pkg:install() {
@@ -135 +151 @@
 
 function pkg:extract() {
-    for tgz in "${PKG_DATA}"/{*.tar.gz,*.tgz}; do
+    for tgz in "${PKG_DATA}"/*.{tar.gz,tgz}; do
         tar -zxf "${tgz}"
     done
@@ -166 +182 @@
 }
 
-rm -rf "${PKG_DEST}/usr/share/locale"
 rm -rf "${PKG_DEST}/usr/share/man"
 rm -rf "${PKG_DEST}/usr/share/info"
 rm -rf "${PKG_DEST}/usr/share/gtk-doc"
 rm -rf "${PKG_DEST}/usr/share/doc"
+rm -rf "${PKG_DEST}/usr/share/locale"
 rm -rf "${PKG_DEST}/usr/man"
 rm -rf "${PKG_DEST}/usr/local/share/man"
@@ -203 +219 @@
 done
 
-cp -a "${PKG_DATA}/_metadata/version" "${PKG_STAT}/data-ver"
+cp -aL "${PKG_DATA}/_metadata/version" "${PKG_STAT}/data-ver"
 echo "${PKG_HASH}" >"${PKG_STAT}/data-md5"
+
+echo "hashed code ${PKG_NAME} to: $("${PKG_BASE}"/util/catdir.sh "${PKG_DEST}" | md5sum | cut -d ' ' -f 1)"

trunk/package.sh

@@ -19 +19 @@
 ./control.sh "${PKG_NAME}" control >"$(pkg_ /DEBIAN/control)"
 
-if [[ -e "${PKG_DATA}"/_metadata/preinst ]]; then
-    cp -a "${PKG_DATA}"/_metadata/preinst "$(pkg_ /DEBIAN)"
-fi
-
-if [[ -e "${PKG_DATA}"/_metadata/postinst ]]; then
-    cp -a "${PKG_DATA}"/_metadata/postinst "$(pkg_ /DEBIAN)"
-fi
-
-if [[ -e "${PKG_DATA}"/_metadata/prerm ]]; then
-    cp -a "${PKG_DATA}"/_metadata/prerm "$(pkg_ /DEBIAN)"
-fi
+for script in preinst extrainst_ postinst prerm postrm; do
+    if [[ -e "${PKG_DATA}/_metadata/${script}.c" ]]; then
+        ./exec.sh - "${PKG_TARG}-gcc" -o "$(pkg_ /DEBIAN)/${script}" "${PKG_DATA}/_metadata/${script}.c"
+        ./exec.sh - ldid -S "$(pkg_ /DEBIAN)/${script}"
+    elif [[ -e "${PKG_DATA}/_metadata/${script}" ]]; then
+        cp -a "${PKG_DATA}/_metadata/${script}" "$(pkg_ /DEBIAN)"
+    fi
+done
 
 if [[ -e "${PKG_DATA}"/_metadata/conffiles ]]; then
@@ -52 +49 @@
     else
         ./control.sh "${PKG_NAME}" control "${PKG_VRSN}-${PKG_RVSN}" >"$(pkg_ /DEBIAN/control)"
-        dpkg-deb -b "${PKG_DEST}" "${PKG_PACK}"
+        dpkg-deb -Z"${PKG_ZLIB}" -b "${PKG_DEST}" "${PKG_PACK}"
         echo "${PKG_HASH}" >"${PKG_STAT}/dest-md5"
         echo "${PKG_RVSN}" >"${PKG_STAT}/dest-ver"