diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 11:37:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 17:09:33 +0000 |
| commit | 2ee979ff71d31e497be856ea1443667c6d799d34 (patch) | |
| tree | e4c0750149126b764418ddaa1f66295b806abdec | |
| parent | 77cd2ef06bdf701b047c4f8c817b364b8b4b8837 (diff) | |
| download | openembedded-core-2ee979ff71d31e497be856ea1443667c6d799d34.tar.gz openembedded-core-2ee979ff71d31e497be856ea1443667c6d799d34.tar.bz2 openembedded-core-2ee979ff71d31e497be856ea1443667c6d799d34.zip | |
image/populate_sdk: Simplify imagetest inclusion and drop dummy class file
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/imagetest-dummy.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 3 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-toolchain.bb | 3 |
4 files changed, 4 insertions, 6 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" diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb index 61f9d34f4b..dccf394c10 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 |