diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-03-03 14:15:13 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-03-03 14:15:13 +0000 |
| commit | 6513124634a62902dd2e66029dbaf04a4cf14fe6 (patch) | |
| tree | b5d62812a3368eb26060c9608bd5de9fcdaeb548 /packages/linux | |
| parent | 4c3719737a421744bd7fa84f91e89392255f441f (diff) | |
| parent | 2585b92eee7b07381c45cc8fcb37eb2440663bda (diff) | |
merge of 'bfd03d53df75d483ec5af8f6299ec49daf006094'
and 'd9d41f4703c2c7b8cf2dfa2c496bc9a5597f0452'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 7 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index c6bb6bae69..3bd9f78ea2 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -67,12 +67,17 @@ do_compile_prepend() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} - + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib + #reflash.ctl is required to reflash using bootldr # format: # name file md5sumfile destination echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl gen_haret_startup + + if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then + cp ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-$(basename ${KERNEL_INITRAMFS_PATH} | awk -F. '{print $1}')-${PV}-${PR}-${MACHINE}.bin + fi } do_deploy[dirs] = "${S}" 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 8e3ab4d06d..066c17faed 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 = "r13" +PR = "r14" DEFAULT_PREFERENCE = "-1" |