5 files changed, 18 insertions, 17 deletions
diff --git a/packages/linux/gumstix-linux.inc b/packages/linux/gumstix-linux.inc
index 50111cb545..038089c965 100644
--- a/packages/linux/gumstix-linux.inc
+++ b/packages/linux/gumstix-linux.inc
@@ -35,16 +35,6 @@ do_configure_prepend() {
        yes '' | oe_runmake oldconfig
 }
 
-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) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-            fi
-        fi
-}
-
 do_install_prepend() {
         if test -e arch/${ARCH}/boot/Image ; then
              ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
@@ -68,7 +58,4 @@ do_deploy() {
         fi
 }
 
-addtask sizecheck before do_install after do_compile
 addtask deploy before do_package after do_install
-
-
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch b/packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch
new file mode 100644
index 0000000000..b503a6326a
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2008-03-08 11:13:58.939360172 +0100
++++ kernel26/usr/Makefile	2008-03-08 11:14:03.270190232 +0100
+@@ -34,7 +34,7 @@
+ endif
+ 
+ quiet_cmd_initfs = GEN     $@
+-      cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
++      cmd_initfs = echo
+ 
+ targets := initramfs_data.cpio.gz
+ # do not try to update files included in initramfs
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 3bd9f78ea2..a2efdc955a 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -55,12 +55,16 @@ do_configure() {
 }
 
 do_compile_prepend() {
-	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
+	# Clean up any stale initramfs archive
+	rm -f usr/initramfs_data.cpio.gz
+	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
 	    if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
 		echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
 		exit 1
 	    fi
 	    cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz
+	    # touch is for broken Koen's cp
+	    touch usr/initramfs_data.cpio.gz
 	fi
 }
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 672d038619..4fa2e2bd9b 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r15"
+PR = "r18"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -12,6 +12,6 @@ FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAM
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \
            http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \
-           file://defconfig"
+	   file://defconfig"
 
 require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 835437415f..e0303c272f 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -144,6 +144,5 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask sizecheck before do_install after do_compile
 addtask deploy before do_package after do_install