diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-03-08 12:57:25 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-03-08 12:57:25 +0000 |
| commit | 0a9a13bbe39c77e4d183d4dbafe24484191b4620 (patch) | |
| tree | 574ed88326525a90bc9b2330f5919949d6077a8e /packages/linux | |
| parent | 98074f877fa79d47a22174f8b2ea7681a1240dbf (diff) | |
| parent | f66075c24322d83493c05dcdad63c9e3fd1fea49 (diff) | |
merge of '2c5004d72a3f70fdae1b53fd5cfe6b9ba04648c1'
and 'a165e975aad0f13da309bb70051fe1419481cb0a'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch | 11 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 4 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 5 |
3 files changed, 17 insertions, 3 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 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..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..d9ec0efb71 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" @@ -12,6 +12,7 @@ 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://keep-initramfs.patch;patch=1 \ + file://defconfig" require linux-handhelds-2.6.inc |