From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 8 Mar 2008 11:30:16 +0000 (+0000)
Subject: linux-handhelds-2.6: Fix some initramfs support issues.
X-Git-Tag: Release-2010-05/1~7538^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e85a77231cabd341bbd9320bce4c24a0f314244;p=openembedded.git

linux-handhelds-2.6: Fix some initramfs support issues.
* Be sure to clean up any possible old initramfs.
* Fix bashism.
---

diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 3bd9f78ea2..998711fe76 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -55,7 +55,9 @@ do_configure() {
 }
 
 do_compile_prepend() {
-	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
+	# Clean up any stale initramfs archive
+	rm 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
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..a9cbff4d7e 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 = "r16"
 
 DEFAULT_PREFERENCE = "-1"