summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-03-14 08:30:01 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-03-14 08:30:01 +0000
commit4df6160f24b0049d2956740847eed1ed484d5d0a (patch)
treebc232481697baa9001e014b3b06c80d2bd9cb54e
parenteaba7389f65a007c3cee55e0ba1f260e7aa6a0f7 (diff)
parent21af76526a4c0ad05348de8a7fb10c6b0d226f95 (diff)
merge of '18293653fb0ec41c60cab9ca36df1dd7c1834880'
and 'b54f849e3abe2877a2579b6348c60e2c6c1a08ca'
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch11
-rw-r--r--packages/linux/linux-handhelds-2.6.inc5
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb2
3 files changed, 6 insertions, 12 deletions
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
deleted file mode 100644
index b503a6326a..0000000000
--- a/packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /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 5970ace054..48e49115f0 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -38,6 +38,11 @@ do_configure() {
fi
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
+
# Kernel expects non-compressed cpio
gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
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 9d493c3212..3df1102761 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 = "r19"
+PR = "r20"
DEFAULT_PREFERENCE = "-1"