diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-03 16:19:10 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-03 16:19:10 +0000 |
| commit | bccc0c67f2d14c3aeaaff7eb014b082489db96c4 (patch) | |
| tree | 837bc3b12446ebd4171c92f9a105f93ecc073ba5 /packages/linux | |
| parent | 27ab96dbf10ef5111ea8b7ff8982bf428634a385 (diff) | |
| parent | 6513124634a62902dd2e66029dbaf04a4cf14fe6 (diff) | |
merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'
and '728bbddd3caaaeb9c83d85b9eb213042e12070bb'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-hackndev-2.6_git.bb | 4 | ||||
| -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 |
3 files changed, 9 insertions, 4 deletions
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb index 2d2a37f716..7fdf94f3ac 100644 --- a/packages/linux/linux-hackndev-2.6_git.bb +++ b/packages/linux/linux-hackndev-2.6_git.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r13" +PR = "r14" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" -SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=git \ +SRC_URI = "git://git.hackndev.com/linux-hnd;protocol=git \ file://defconfig" SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ 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" |