merge of '09957ec14fdf3babf0d22d779c7264d24330e535'

     and 'c03b12513a0d9faea02ff87386f5cb243f7ece3e'

9 files changed, 60 insertions, 20 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index a81263a12a..1294e41c65 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -82,6 +82,9 @@ def base_dep_prepend(d):
 	if bb.data.getVar('PN', d, True) == "shasum-native":
 		deps = ""
 
+	# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
+	# we need that built is the responsibility of the patch function / class, not
+	# the application.
 	if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
 		if (bb.data.getVar('HOST_SYS', d, 1) !=
 	     	    bb.data.getVar('BUILD_SYS', d, 1)):
@@ -272,8 +275,12 @@ oe_libinstall() {
 
 	# If such file doesn't exist, try to cut version suffix
 	if [ ! -f "$lafile" ]; then
-		libname=`echo "$libname" | sed 's/-[0-9.]*$//'`
-		lafile=$libname.la
+		libname1=`echo "$libname" | sed 's/-[0-9.]*$//'`
+		lafile1=$libname.la
+		if [ -f "$lafile1" ]; then
+			libname=$libname1
+			lafile=$lafile1
+		fi
 	fi
 
 	if [ -f "$lafile" ]; then
@@ -807,6 +814,7 @@ def base_after_parse(d):
 
 
     pn = bb.data.getVar('PN', d, 1)
+
     # OBSOLETE in bitbake 1.7.4
     srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
     if srcdate != None:
@@ -816,9 +824,22 @@ def base_after_parse(d):
     if use_nls != None:
         bb.data.setVar('USE_NLS', use_nls, d)
 
-    # Make sure MACHINE *isn't* exported
+    # Make sure MACHINE isn't exported
+    # (breaks binutils at least)
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
+    
+    # Make sure DISTRO isn't exported
+    # (breaks sysvinit at least)
+    bb.data.delVarFlag('DISTRO', 'export', d)
+    bb.data.setVarFlag('DISTRO', 'unexport', 1, d)
+
+    # Git packages should DEPEND on git-native
+    srcuri = bb.data.getVar('SRC_URI', d, 1)
+    if "git://" in srcuri:
+        depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+        depends = depends + " git-native:do_populate_staging"
+        bb.data.setVarFlag('do_fetch', 'depends', depends, d)
 
     mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
     old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index dadf2dddfc..497b78f454 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -18,6 +18,8 @@ def get_binconfig_mangle(d):
 		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
 		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
 		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
+		s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
 	return s
 
 BINCONFIG_GLOB ?= "*-config"
diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index 855a72a2f7..b86562890a 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,8 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
-RDEPENDS += " hicolor-icon-theme "
+RDEPENDS += "hicolor-icon-theme"
 
+# This could run on the host as icon cache files are architecture independent,
+# but there is no gtk-update-icon-cache built natively.
 gtk-icon-cache_postinst() {
 if [ "x$D" != "x" ]; then
         exit 1
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 101b53307a..248ccab60b 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -58,6 +58,7 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
 LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
 
 ROOTFS_POSTPROCESS_COMMAND ?= ""
+MACHINE_POSTPROCESS_COMMAND ?= ""
 
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
@@ -100,6 +101,8 @@ fakeroot do_rootfs () {
 	done
 
 	${IMAGE_POSTPROCESS_COMMAND}
+	
+	${MACHINE_POSTPROCESS_COMMAND}
 }
 
 insert_feed_uris () {
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index c5bd1c5e24..17b3bbafa6 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -17,6 +17,7 @@ def openmoko_two_get_subdir(d):
     elif section in 'apps tools pim'.split(): return "applications"
     elif section == "panel-plugin": return "panel-plugins"
     elif section == "inputmethods": return "inputmethods"
+    elif section == "daemons": return "daemons"
     else: return section
 
 LICENSE = "${@openmoko_two_get_license(d)}"
@@ -29,3 +30,4 @@ FILES_${PN} += "${datadir}/icons"
 
 # SVNREV = "r${SRCREV}"
 SVNREV = "${SRCDATE}"
+
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/
+}
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass
index 937c973ad5..a3b8b36dd0 100644
--- a/classes/seppuku.bbclass
+++ b/classes/seppuku.bbclass
@@ -346,8 +346,8 @@ python seppuku_eventhandler() {
             bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text)
             if not bug_number:
                 print >> debug_file, "Filing a bugreport failed"
-        else:
-            print >> debug_file, "The new bug_number: '%s'" % bug_number
+            else:
+                print >> debug_file, "The new bug_number: '%s'" % bug_number
 
         if file:
             if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass
index 9821eec5b2..3051b7933f 100644
--- a/classes/update-rc.d.bbclass
+++ b/classes/update-rc.d.bbclass
@@ -7,17 +7,15 @@ INIT_D_DIR = "${sysconfdir}/init.d"
 
 updatercd_postinst() {
 if test "x$D" != "x"; then
-	D="-r $D"
+	OPT="-r $D"
 else
-	D="-s"
+	OPT="-s"
 fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 }
 
 updatercd_prerm() {
-if test "x$D" != "x"; then
-	D="-r $D"
-else
+if test "x$D" = "x"; then
 	${INIT_D_DIR}/${INITSCRIPT_NAME} stop
 fi
 }