From 66694fe312cf0668d08e42246332ce085a4d6372 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 9 Nov 2015 16:45:21 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb | 11 +++++++++-- 1 file 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -inherit nativesdk +inherit allarch + +python() { + # Put the package somewhere separate to ensure it's never used except + # when we want it + # (note that we have to do this in anonymous python here to avoid + # allarch.bbclass disabling itself) + d.setVar('PACKAGE_ARCH', 'buildtools-dummy-${SDKPKGSUFFIX}') +} -# Put it somewhere separate to ensure it's never used except when we want it PACKAGE_ARCH = "buildtools-dummy-${SDKPKGSUFFIX}" PERLPACKAGES = "nativesdk-perl \ -- cgit 1.2.3-korg