diff options
| -rw-r--r-- | arch/iphoneos-arm/1443.00/strip | 6 | ||||
| -rwxr-xr-x | construct.sh | 1 | ||||
| -rwxr-xr-x | control.sh | 6 | ||||
| -rwxr-xr-x | folders.sh | 4 | ||||
| -rwxr-xr-x | helper.sh | 4 | ||||
| -rwxr-xr-x | make.sh | 4 | ||||
| -rwxr-xr-x | package.sh | 2 | ||||
| -rwxr-xr-x | remake.sh | 2 |
8 files changed, 18 insertions, 11 deletions
diff --git a/arch/iphoneos-arm/1443.00/strip b/arch/iphoneos-arm/1443.00/strip index fb6f928c1..0fe0bba54 100644 --- a/arch/iphoneos-arm/1443.00/strip +++ b/arch/iphoneos-arm/1443.00/strip @@ -21,13 +21,13 @@ find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) continue; fi if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then continue; fi - if "${PKG_BASE}/util/ldid3" -e "${bin}" >/dev/null 2>&1; then + if "${PKG_BASE}/util/ldid" -e "${bin}" >/dev/null 2>&1; then continue; fi perms=$(stat -f %p "${bin}" | sed -e s/^1//) chmod 755 "${bin}" - echo "${PKG_BASE}/util/ldid3" -S"${ENTITLEMENT}" "${bin}" - "${PKG_BASE}/util/ldid3" -S"${ENTITLEMENT}" "${bin}" + echo "${PKG_BASE}/util/ldid" -S"${ENTITLEMENT}" "${bin}" + "${PKG_BASE}/util/ldid" -S"${ENTITLEMENT}" "${bin}" chmod "${perms}" "${bin}" done diff --git a/construct.sh b/construct.sh index aa3d1e400..91c6100a1 100755 --- a/construct.sh +++ b/construct.sh @@ -137,4 +137,5 @@ EOF popd done +rsync -a "${PKG_BASE}/info" "${PKG_REPO}" diff -x Release.gpg -x Release -x Packages.xz -x Packages.bz2 -ur "${PKG_BASE}/apt-old/" "${PKG_REPO}" diff --git a/control.sh b/control.sh index 45e2df32e..513e679eb 100755 --- a/control.sh +++ b/control.sh @@ -145,6 +145,12 @@ Conflicts: $(cat "${PKG_DATA}/_metadata/conflicts") EOF fi +if [[ -e ${PKG_DATA}/_metadata/breaks ]]; then + cat <<EOF +Breaks: $(cat "${PKG_DATA}/_metadata/breaks") +EOF +fi + if [[ -e ${PKG_DATA}/_metadata/provides ]]; then cat <<EOF Provides: $(cat "${PKG_DATA}/_metadata/provides" | sed -e s/%MYVERSION%/${PKG_VRSN%-*}/) diff --git a/folders.sh b/folders.sh index d73a21283..c46c5f525 100755 --- a/folders.sh +++ b/folders.sh @@ -38,11 +38,11 @@ function pkg: { declare argc=$# for ((i=0; $i != $argc; ++i)); do - argv[$i]=$(pkg_ "$1") + argv[$i]="$(pkg_ "$1")" shift done - "${argv[@]}" + ${FAKEROOT} "${argv[@]}" } export -f pkg: @@ -2,7 +2,9 @@ source "${PKG_BASE}/architect.sh" -export PKG_ROOT=$(xcrun -sdk iphoneos --show-sdk-path) +export FAKEROOT="fakeroot -i \"${PKG_BASE}/.fakeroot\" -s \"${PKG_BASE}/.fakeroot\"" + +export PKG_ROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.sdk export PKG_CCPF=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--prefix=\([^ ]*\).*/\1/') source "${PKG_BASE}/folders.sh" @@ -11,8 +11,6 @@ export PKG_MAKE=$0 export PKG_NAME=${1%_} export PKG_BASE=$(realpath "$(dirname "$0")") -export FAKEROOT=fakeroot - . "${PKG_BASE}/helper.sh" if [[ ! -x ${PKG_BASE}/util/arid || ${PKG_BASE}/util/arid -ot ${PKG_BASE}/util/arid.cpp ]]; then @@ -160,7 +158,7 @@ function pkg:install() { export -f pkg:install function pkg:extract() { - for tgz in "${PKG_DATA}"/*.{tar.{gz,xz,bz2},tgz}; do + for tgz in "${PKG_DATA}"/*.{tar.{gz,xz,bz2,lz},tgz}; do tar -xf "${tgz}" done diff --git a/package.sh b/package.sh index 24ccad70d..ba8eefa7c 100755 --- a/package.sh +++ b/package.sh @@ -67,7 +67,7 @@ else echo "package ${PKG_PACK} already exists..." else ./control.sh "${PKG_NAME}" control "${PKG_VRSN}-${PKG_RVSN}" >"$(pkg_ /DEBIAN/control)" - fakeroot dm.pl -Z"${PKG_ZLIB}" -b "${PKG_DEST}" "${PKG_PACK}" + ${FAKEROOT} dm.pl -Z"${PKG_ZLIB}" -b "${PKG_DEST}" "${PKG_PACK}" echo "${PKG_HASH}" >"${PKG_STAT}/dest-md5" echo "${PKG_RVSN}" >"${PKG_STAT}/dest-ver" if [[ -e "${PKG_BASE}"/upload.sh ]]; then @@ -1,3 +1,3 @@ #!/bin/bash -rm -f stat/${PKG_ARCH}/$1/data-md5 +rm -f stat/${PKG_ARCH}/${PKG_CFTARG}/$1/data-md5 ./make.sh "$1" |