[oe-commits] org.oe.dev package_deb/rootfs_deb.bbclass: Sync fixes from Poky

[rpurdie commit]

package_deb/rootfs_deb.bbclass: Sync fixes from Poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: e609b6a9ff4128a148102c97d991816ec7782504
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e609b6a9ff4128a148102c97d991816ec7782504
Files:
1
classes/package_deb.bbclass
classes/rootfs_deb.bbclass
Diffs:

#
# mt diff -r639e1e03220bb382c188b5590ef8e32e14d155df -re609b6a9ff4128a148102c97d991816ec7782504
#
# 
# 
# patch "classes/package_deb.bbclass"
#  from [d9817556bc8d0216be0724c9e3aa9f9703d01496]
#    to [2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec]
# 
# patch "classes/rootfs_deb.bbclass"
#  from [ea60c04636d188493ddb3bb12f1d3f28d078a109]
#    to [879ba74c1e013701649d53858c52b79d09441ccd]
# 
============================================================
--- classes/package_deb.bbclass	d9817556bc8d0216be0724c9e3aa9f9703d01496
+++ classes/package_deb.bbclass	2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec
@@ -1,3 +1,7 @@
+#
+# Copyright 2006-2007 OpenedHand Ltd.
+#
+
 inherit package
 
 PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
@@ -132,6 +136,7 @@ python do_package_deb () {
             continue
         controldir = os.path.join(root, 'DEBIAN')
         bb.mkdirhier(controldir)
+        os.chmod(controldir, 0755)
         try:
             ctrlfile = file(os.path.join(controldir, 'control'), 'wb')
             # import codecs
@@ -150,7 +155,7 @@ python do_package_deb () {
         fields.append(["Priority: %s\n", ['PRIORITY']])
         fields.append(["Maintainer: %s\n", ['MAINTAINER']])
         fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
-        fields.append(["OE: %s\n", ['P']])
+        fields.append(["OE: %s\n", ['PN']])
         fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
 #        Package, Version, Maintainer, Description - mandatory
============================================================
--- classes/rootfs_deb.bbclass	ea60c04636d188493ddb3bb12f1d3f28d078a109
+++ classes/rootfs_deb.bbclass	879ba74c1e013701649d53858c52b79d09441ccd
@@ -1,3 +1,6 @@
+#
+# Copyright 2006-2007 Openedhand Ltd.
+#
 
 do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
 
@@ -52,21 +55,21 @@ fakeroot rootfs_deb_do_rootfs () {
 	}
 
 	if [ ! -z "${LINGUAS_INSTALL}" ]; then
-		apt-get install glibc-localedata-i18n
-		if [ $? -eq 1 ]; then
-			exit 1
+		apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
+		if [ $? -ne 0 ]; then
+			exit $?
 		fi
 		for i in ${LINGUAS_INSTALL}; do
-			apt-get install $i
-			if [ $? -eq 1 ]; then
-				exit 1
+			apt-get install $i --force-yes --allow-unauthenticated
+			if [ $? -ne 0 ]; then
+				exit $?
 			fi
 		done
 	fi
 
 	if [ ! -z "${PACKAGE_INSTALL}" ]; then
 		for i in ${PACKAGE_INSTALL}; do
-			apt-get install $i
+			apt-get install $i --force-yes --allow-unauthenticated
 			if [ $? -eq 1 ]; then
 				exit 1
 			fi
@@ -134,3 +137,7 @@ rootfs_deb_log_check() {
 	true
 }
 
+remove_packaging_data_files() {
+	rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/
+	rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
+}