Fix permissions in dpkg-deb and add du back to package.

diff --git a/makefile b/makefile
index ddb9024a8fdba0d4f4468921ea8b76e57cb0c32f..dcd482a93c06f44e8aa5ddcbf9cf5810382adc86 100644 (file)
--- a/makefile
+++ b/makefile
@@ -40,13 +40,12 @@ Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm
        cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
 
 package: Cydia
        cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
 
 package: Cydia

-       rm -rf _
+       sudo rm -rf _

        mkdir -p _/var/lib/cydia
        
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia
        mkdir -p _/var/lib/cydia
        
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia

-       # XXX: fix du
-       #cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia
+       cp -a sysroot/usr/bin/du _/usr/libexec/cydia

        
        mkdir -p _/System/Library
        cp -a LaunchDaemons _/System/Library/LaunchDaemons
        
        mkdir -p _/System/Library
        cp -a LaunchDaemons _/System/Library/LaunchDaemons


@@ -54,7 +53,6 @@ package: Cydia
        mkdir -p _/Applications
        cp -a Cydia.app _/Applications/Cydia.app
        cp -a Cydia _/Applications/Cydia.app/Cydia_
        mkdir -p _/Applications
        cp -a Cydia.app _/Applications/Cydia.app
        cp -a Cydia _/Applications/Cydia.app/Cydia_

-       chmod 6755 _/Applications/Cydia.app/Cydia_

        
        mkdir -p _/System/Library/PreferenceBundles
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
        
        mkdir -p _/System/Library/PreferenceBundles
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle


@@ -62,6 +60,10 @@ package: Cydia
        mkdir -p _/DEBIAN
        echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
        
        mkdir -p _/DEBIAN
        echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
        

+       sudo chown -R 0 _
+       sudo chgrp -R 0 _
+       sudo chmod 6755 _/Applications/Cydia.app/Cydia_
+       

        $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
 .PHONY: all clean sign
        $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
 .PHONY: all clean sign

diff --git a/sysroot.sh b/sysroot.sh
index db06c108ed2e9862482e73872c74c4748a83b18b..819d8b72a23e48698e8b8947c3d72e9c00541cda 100755 (executable)
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -26,7 +26,7 @@ wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture
     while IFS= read -r line; do
         if [[ ${line} == '' ]]; then
             package=${fields[package]}
     while IFS= read -r line; do
         if [[ ${line} == '' ]]; then
             package=${fields[package]}

-            if [[ ${package} == *(apr|apr-lib|apt7|apt7-lib|mobilesubstrate|pcre) ]]; then
+            if [[ ${package} == *(apr|apr-lib|apt7|apt7-lib|coreutils|mobilesubstrate|pcre) ]]; then

                 filename=${fields[filename]}
                 wget -O "${package}.deb" "${repository}${filename}"
                 dpkg-deb -x "${package}.deb" .
                 filename=${fields[filename]}
                 wget -O "${package}.deb" "${repository}${filename}"
                 dpkg-deb -x "${package}.deb" .