summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass3
-rw-r--r--meta/classes/imagetest-dummy.bbclass1
-rw-r--r--meta/classes/populate_sdk_base.bbclass3
3 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 719d871bca..1461144949 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,8 +1,5 @@
inherit rootfs_${IMAGE_PKGTYPE}
-IMAGETEST ?= "dummy"
-inherit imagetest-${IMAGETEST}
-
inherit populate_sdk_base
TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
diff --git a/meta/classes/imagetest-dummy.bbclass b/meta/classes/imagetest-dummy.bbclass
deleted file mode 100644
index bcacae604f..0000000000
--- a/meta/classes/imagetest-dummy.bbclass
+++ /dev/null
@@ -1 +0,0 @@
-# dummy testclass file
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 88bcb27757..473b12673b 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -1,6 +1,9 @@
inherit meta toolchain-scripts
inherit populate_sdk_${IMAGE_PKGTYPE}
+IMAGETESTCLASS = "${@oe.utils.ifelse(d.getVar('IMAGETEST'),'imagetest-' + (d.getVar('IMAGETEST') or ""),'')}"
+inherit ${IMAGETESTCLASS}
+
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"