summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-08-07 15:03:19 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-08-07 15:03:19 +0000
commit933172af0a4715960c3a7dd8c716ff2d9c1f4080 (patch)
tree85edebf080f56054cf4385d6eb049fb07a8d4fb6
parenta3e805ea4621615d52d3019e95cabc27ca8c770e (diff)
package_deb/rootfs_deb.bbclass: Sync fixes from Poky
-rw-r--r--classes/package_deb.bbclass7
-rw-r--r--classes/rootfs_deb.bbclass21
2 files changed, 20 insertions, 8 deletions
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index d172fb1766..9a8db4f8f2 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -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
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index f444541509..67fa661308 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -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/
+}