summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-09 16:45:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:10 +0000
commit4ed84ffe0d4bb097258ffb5bf636509cf37a510c (patch)
treee8d066b2b1866eb193e617e1cd358135f0c95712
parentb8fdd0975a8966b3b2a9b4f5951332eee6ac0ed8 (diff)
downloadpoky-4ed84ffe0d4bb097258ffb5bf636509cf37a510c.tar.gz
nativesdk-buildtools-perl-dummy: fix rebuilding when SDKMACHINE changes
This recipe produces an empty dummy package (in order to satisfy dependencies on perl so we don't have perl within buildtools-tarball). Because we were inheriting nativesdk here the recipe was being rebuilt, but having forced PACKAGE_ARCH to a particular value the packages for each architecture were stepping on eachother. Since the packages are empty they can in fact be allarch (even though they won't actually go into the "all" package feed). It turns out that nheriting nativesdk wasn't actually necessary either, so drop that. Fixes [YOCTO #8509]. (From OE-Core rev: 9b1831cf4a2940dca1d23f14dff460ff5a50a520) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
index d971c3ca3d..6fb2b64f79 100644
--- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
+++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
@@ -2,9 +2,16 @@ SUMMARY = "Dummy package which ensures perl is excluded from buildtools"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 3LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
4 4
5inherit nativesdk 5inherit allarch
6
7python() {
8 # Put the package somewhere separate to ensure it's never used except
9 # when we want it
10 # (note that we have to do this in anonymous python here to avoid
11 # allarch.bbclass disabling itself)
12 d.setVar('PACKAGE_ARCH', 'buildtools-dummy-${SDKPKGSUFFIX}')
13}
6 14
7# Put it somewhere separate to ensure it's never used except when we want it
8PACKAGE_ARCH = "buildtools-dummy-${SDKPKGSUFFIX}" 15PACKAGE_ARCH = "buildtools-dummy-${SDKPKGSUFFIX}"
9 16
10PERLPACKAGES = "nativesdk-perl \ 17PERLPACKAGES = "nativesdk-perl \