From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Mon, 4 Oct 2010 10:02:26 +0000 (-0700)
Subject: Fix permissions in dpkg-deb and add du back to package.
X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/393ab8b93f1a1ff91600073fb399b88c194e0168?ds=sidebyside;hp=1e4922b8442669a0f94a6602a49d950233555fff

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

diff --git a/makefile b/makefile
index ddb9024a..dcd482a9 100644
--- 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
-	rm -rf _
+	sudo rm -rf _
 	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
@@ -54,7 +53,6 @@ package: 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
@@ -62,6 +60,10 @@ package: Cydia
 	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
diff --git a/sysroot.sh b/sysroot.sh
index db06c108..819d8b72 100755
--- 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]}
-            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" .