Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

8 files changed, 33 insertions, 10 deletions

diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass
index d73b62f485..6b4fdf878a 100644
--- a/classes/canadian-sdk.bbclass
+++ b/classes/canadian-sdk.bbclass
@@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}"
 # and otherwise just
 DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils "
 
-SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}"
+
+# On mingw systems we want to have the real sysroot default to c:/... and
+# assume that the default install will be on the C drive.  This can be changed
+# by setting SDK_REALPATH_MINGW.
 SDK_REALPATH = "${SDK_PATH}"
-SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}"
+SDK_REALPATH_MINGW ?= "C:"
 
 # Path prefixes
 prefix = "${SDK_PATH}"
diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index b256365175..ea1fdff3dd 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -11,11 +11,19 @@ fi
 # Update the pixbuf loaders in case they haven't been registered yet
 gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
 
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+for icondir in /usr/share/icons/* ; do
+    if [ -d $icondir ] ; then
+        gtk-update-icon-cache -qt  $icondir
+    fi
+done
 }
 
 gtk_icon_cache_postrm() {
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+for icondir in /usr/share/icons/* ; do
+    if [ -d $icondir ] ; then
+        gtk-update-icon-cache -qt  $icondir
+    fi
+done
 }
 
 python populate_packages_append () {
@@ -24,7 +32,7 @@ python populate_packages_append () {
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	
 	for pkg in packages:
-		icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
+		icon_dir = '%s/install/%s/%s/icons' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
 		if not os.path.exists(icon_dir):
 			continue
 		
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 3e519c3253..584a5f1c1e 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -31,6 +31,9 @@ PACKAGEFUNCS += " do_package_qa "
 #           TARGET_OS  TARGET_ARCH   MACHINE, OSABI, ABIVERSION, Little Endian, 32bit?
 def package_qa_get_machine_dict():
     return {
+            "darwin9" : { 
+                        "arm" :       (40,     0,    0,          True,          True),
+                      },
             "linux" : { 
                         "arm" :       (40,    97,    0,          True,          True),
                         "armeb":      (40,    97,    0,          False,         True),
@@ -184,7 +187,7 @@ def package_qa_make_fatal_error(error_class, name, path,d):
 
     TODO: Load a whitelist of known errors
     """
-    return not error_class in [0, 5, 7, 9]
+    return not error_class in [0, 5, 7]
 
 def package_qa_write_error(error_class, name, path, d):
     """
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 38256d7798..cacd2ce525 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -72,7 +72,7 @@ oe_jarinstall() {
       oewarn "file was in the way. removing:" $dir/$1
       rm $dir/$1
     fi
-    ln -s $destname $dir/$1
+    ln -sf $destname $dir/$1
     shift
   done
 }
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 17e8941745..954c407d51 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -64,6 +64,10 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt
 KERNEL_VERSION = "${@get_kernelversion('${S}')}"
 KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
 
+# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force
+# rebuilds for kernel and external modules
+PR = "${MACHINE_KERNEL_PR}"
+
 KERNEL_LOCALVERSION ?= ""
 
 # kernels are generally machine specific
diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 9a48408527..03ba9d094f 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -1,9 +1,9 @@
 PACKAGES += "${PN}-bin"
 
-FILES_${PN} = "${libexecdir} ${libdir}/lib*.so.* \
+FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
 	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+	    ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
 		${datadir}/aclocal ${bindir}/*-config"
 FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*"
diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass
index c98baceeab..bc53e1bad5 100644
--- a/classes/module-base.bbclass
+++ b/classes/module-base.bbclass
@@ -5,6 +5,10 @@ inherit kernel-arch
 export OS = "${TARGET_OS}"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
 
+# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force
+# rebuilds for kernel and external modules
+PR = "${MACHINE_KERNEL_PR}"
+
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
 export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
 KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index 55ab371af3..82a1616d05 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -26,6 +26,7 @@ def get_siteinfo_list(d):
                "armeb-linux-uclibc":      "endian-big bit-32 common-linux common-uclibc arm-common",\
                "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\
                "arm-darwin":              "endian-little bit-32 common-darwin",\
+               "arm-darwin9":             "endian-little bit-32 common-darwin",\
                "arm-linux":               "endian-little bit-32 common-linux common-glibc arm-common",\
                "arm-linux-gnueabi":       "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\
                "arm-linux-uclibc":        "endian-little bit-32 common-linux common-uclibc arm-common",\