From a9b0ccde933c813a16755be5e35e9a3c9dca414a Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Mon, 13 Jun 2005 10:40:10 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/13 12:25:57+02:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/src/build/unstable.wrt/openembedded 2005/06/13 12:25:31+02:00 (none)!br1 fixing wrt dependencies BKrev: 42ad628abN5RLmyYn_AZdKtzwVfY9A --- classes/wrt-image.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass index f8ecce320b..ba1163a719 100644 --- a/classes/wrt-image.bbclass +++ b/classes/wrt-image.bbclass @@ -3,15 +3,14 @@ ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*" def wrt_get_kernel_version(d): import bb - if not bb.data.inherits_class('native', d): + if bb.data.inherits_class('image_ipk', d): skd = bb.data.getVar('STAGING_KERNEL_DIR', d, 1) return base_read_file(skd+'/kernel-abiversion') - return "-no kernel version for native-" - -KERNEL_VERSION = "${@wrt_get_kernel_version(d)}" + return "-no kernel version for available-" wrt_create_images() { I=${DEPLOY_DIR}/images + KERNEL_VERSION="${@wrt_get_kernel_version(d)}" for type in ${IMAGE_FSTYPES}; do # generic -- cgit v1.2.3