diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-28 20:42:55 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-28 20:42:55 +0000 |
| commit | 4b0dafd8f68cfcd6ac4fdcf86335ce5ee2040974 (patch) | |
| tree | 1846fc4589701b05cfb067e20f6a5b59d8c41130 | |
| parent | b8d5c1e7a523301b353b1701ba1a757b0918f8eb (diff) | |
| parent | fac5faed2cf403dfbc7918eca753df4a15718597 (diff) | |
merge of '035376021cc4bddb72ee43c0b729ddf51f7ee560'
and '75180fb86668efd36cdf3798af113578d93a3e8c'
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index b24a57f537..5725a8a52e 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -60,6 +60,9 @@ PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" +#Initramfs for kernels +KERNEL_INITRAMFS_PATH = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/initramfs-bootmenu-image-${MACHINE}.cpio.gz" + #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index a0aec9cb36..845c11d7d6 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -54,6 +54,16 @@ do_configure() { } +do_compile_prepend() { + 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 + cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz + fi +} + do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} |