Signed-off-by: Paul Eggleton <[email protected]>
---
meta-oe/classes/kernel.bbclass | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 89aeb92..c17ffde 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}'
@@ -217,7 +216,7 @@ do_menuconfig() {
fi
}
do_menuconfig[nostamp] = "1"
-addtask menuconfig after do_patch
+addtask menuconfig after do_configure
pkg_postinst_kernel () {
cd /${KERNEL_IMAGEDEST}; update-alternatives --install
/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}
${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
@@ -524,7 +523,7 @@ kernel_do_deploy() {
}
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
-addtask deploy before do_package after do_install
+addtask deploy before do_build after do_install
EXPORT_FUNCTIONS do_deploy
--
1.7.4.1
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
