Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into...

[vuplus_openembedded] / classes / wrt-image.bbclass

diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass
index f6ca5bc..45d9ac9 100644 (file)
--- 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', 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
@@ -31,4 +30,4 @@ wrt_create_images() {
 
 IMAGE_POSTPROCESS_COMMAND += "wrt_create_images;"
 
-DEPENDS += "wrt-imagetools"
\ No newline at end of file
+DEPENDS_prepend = "${@["wrt-imagetools-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
\ No newline at end of file