merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'

     and 'cc72cefccea1756ea052a54b2ec73e0ef6e3d9eb'

5 files changed, 23 insertions, 22 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index c00d0f3f58..f896492364 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -80,25 +80,12 @@ kernel_do_stage() {
 	mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia
 	cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/
 
-	if [ -d drivers/crypto ]; then
-		mkdir -p ${STAGING_KERNEL_DIR}/drivers/crypto
-		cp -fR drivers/crypto/* ${STAGING_KERNEL_DIR}/drivers/crypto/
-	fi
-
-        if [ -d include/media ]; then
-                mkdir -p ${STAGING_KERNEL_DIR}/include/media
-                cp -fR include/media/* ${STAGING_KERNEL_DIR}/include/media/
-        fi
-
-	if [ -d include/acpi ]; then
-		mkdir -p ${STAGING_KERNEL_DIR}/include/acpi
-		cp -fR include/acpi/* ${STAGING_KERNEL_DIR}/include/acpi/
-	fi
-
-	if [ -d include/sound ]; then
-		mkdir -p ${STAGING_KERNEL_DIR}/include/sound
-		cp -fR include/sound/* ${STAGING_KERNEL_DIR}/include/sound/
-	fi
+	for entry in drivers/crypto include/media include/acpi include/sound include/video; do
+		if [ -d $entry ]; then
+			mkdir -p ${STAGING_KERNEL_DIR}/$entry
+			cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/
+		fi
+	done
 
 	if [ -d drivers/sound ]; then
 		# 2.4 alsa needs some headers from this directory
@@ -418,3 +405,17 @@ python populate_packages_prepend () {
 	packages.append(metapkg)
 	bb.data.setVar('PACKAGES', ' '.join(packages), d)
 }
+
+# Support checking the kernel size since some kernels need to reside in partitions
+# with a fixed length or there is a limit in transferring the kernel to memory
+do_sizecheck() {
+        if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+            size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+            if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+                    rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+                    die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+            fi
+        fi
+}
+
+addtask sizecheck before do_install after do_compile
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 43c77d42da..4fa9f75eb3 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,4 +1,3 @@
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.inc
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/packages/shared-mime-info/shared-mime-info.inc b/packages/shared-mime-info/shared-mime-info.inc
index 3e591ad2d6..a5176a7bf1 100644
--- a/packages/shared-mime-info/shared-mime-info.inc
+++ b/packages/shared-mime-info/shared-mime-info.inc
@@ -1,6 +1,6 @@
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "libxml2 intltool-native"
+DEPENDS = "libxml2 intltool-native glib-2.0"
 PR = "r0"
 
 SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
diff --git a/packages/shared-mime-info/shared-mime-info_0.22.bb b/packages/shared-mime-info/shared-mime-info_0.22.bb
index f24008ec13..6d3b760390 100644
--- a/packages/shared-mime-info/shared-mime-info_0.22.bb
+++ b/packages/shared-mime-info/shared-mime-info_0.22.bb
@@ -1,2 +1,3 @@
 require shared-mime-info.inc
 
+PR = "r1"
diff --git a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 8d4ede20af..33e321e532 100644
--- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Transparent xcursor theme for handheld systems"
 SECTION = "x11/base"
 PR="r2"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch;patch=1 \
 	   file://fix_watch_cursor.patch;patch=1"
 FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"