[PATCH] image/populate_sdk: Simplify imagetest inclusion and drop dummy class file
DORMANTno replies
From: Richard Purdie <hidden>
Date: 2012-12-06 11:52:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Having to include some dummy class is suboptimal and we no longer need to do this. Also move this check to populate_sdk_base since we then don't need to include it in toolchains specifically. Signed-off-by: Richard Purdie <redacted> ---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7b24e4e..7311906 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 bcacae6..0000000
--- 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 c15a4d4..3c448c3 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"
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 61f9d34..dccf394 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb@@ -6,5 +6,4 @@ PR = "r7" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -IMAGETEST ?= "dummy" -inherit populate_sdk imagetest-${IMAGETEST} +inherit populate_sdk