summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 11:37:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 17:13:12 +0000
commit0e486c71121dafe7a8d67f0e1d9734c0c2db7eb6 (patch)
tree42deba38e7fc968d81c8fb8c4e5b6a7ed66f8e22 /meta
parente3c2952766c1268afe8928295c02b2b17c5cc78a (diff)
downloadpoky-0e486c71121dafe7a8d67f0e1d9734c0c2db7eb6.tar.gz
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. (From OE-Core rev: 2ee979ff71d31e497be856ea1443667c6d799d34) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass3
-rw-r--r--meta/classes/imagetest-dummy.bbclass1
-rw-r--r--meta/classes/populate_sdk_base.bbclass3
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb3
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 @@
1inherit rootfs_${IMAGE_PKGTYPE} 1inherit rootfs_${IMAGE_PKGTYPE}
2 2
3IMAGETEST ?= "dummy"
4inherit imagetest-${IMAGETEST}
5
6inherit populate_sdk_base 3inherit populate_sdk_base
7 4
8TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}" 5TOOLCHAIN_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 @@
1# 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 @@
1inherit meta toolchain-scripts 1inherit meta toolchain-scripts
2inherit populate_sdk_${IMAGE_PKGTYPE} 2inherit populate_sdk_${IMAGE_PKGTYPE}
3 3
4IMAGETESTCLASS = "${@oe.utils.ifelse(d.getVar('IMAGETEST'),'imagetest-' + (d.getVar('IMAGETEST') or ""),'')}"
5inherit ${IMAGETESTCLASS}
6
4SDK_DIR = "${WORKDIR}/sdk" 7SDK_DIR = "${WORKDIR}/sdk"
5SDK_OUTPUT = "${SDK_DIR}/image" 8SDK_OUTPUT = "${SDK_DIR}/image"
6SDK_DEPLOY = "${TMPDIR}/deploy/sdk" 9SDK_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"
6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
8 8
9IMAGETEST ?= "dummy" 9inherit populate_sdk
10inherit populate_sdk imagetest-${IMAGETEST}