diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-07-15 17:29:38 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-15 17:29:38 +0200 |
| commit | b42f8cbcf1b66eb580abdd3c67b2e9ead1270580 (patch) | |
| tree | 98e032f2ba41a3a9b58bd2c7b395fb5ba41c5661 /meta-oe/classes/kernel.bbclass | |
| parent | 14609a197a8fb2c34818fe37ebc0272a0ec07095 (diff) | |
| download | meta-openembedded-b42f8cbcf1b66eb580abdd3c67b2e9ead1270580.tar.gz | |
kernel.bbclass: sync with oe-core after recent initramfs merges
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/classes/kernel.bbclass')
| -rw-r--r-- | meta-oe/classes/kernel.bbclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index a5c9062224..3e3e71cf58 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -7,6 +7,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/$ INHIBIT_DEFAULT_DEPS = "1" KERNEL_IMAGETYPE ?= "zImage" +INITRAMFS_IMAGE ?= "" +INITRAMFS_TASK ?= "" python __anonymous () { kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' @@ -16,7 +18,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) - if image != '' and image is not None: + if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) @@ -25,9 +27,6 @@ python __anonymous () { bb.data.setVar('PR', machine_kernel_pr, d) } -INITRAMFS_IMAGE ?= "" -INITRAMFS_TASK ?= "" - inherit kernel-arch deploy PACKAGES_DYNAMIC += "kernel-module-*" @@ -194,7 +193,7 @@ kernel_do_configure() { yes '' | oe_runmake oldconfig if [ ! -z "${INITRAMFS_IMAGE}" ]; then - for img in cpio.gz cpio.lzo cpio.lzma; do + for img in cpio.gz cpio.lzo cpio.lzma cpio.xz ; do if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img fi @@ -202,7 +201,7 @@ kernel_do_configure() { fi } -kernel_do_configure[depends] += "${INITRAMFS_TASK}" +do_configure[depends] += "${INITRAMFS_TASK}" do_menuconfig() { export DISPLAY='${DISPLAY}' |