aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 13:59:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 16:33:26 +0100
commit8a733097bddcf0868fb5f8ca08ea59b2cbc4a3a9 (patch)
treefe9950d256e361688f2ec58f90c5e2c4e8d1e9a9
parent5484596f4252e707ff791feedf143a72dbb613f6 (diff)
downloadopenembedded-core-contrib-8a733097bddcf0868fb5f8ca08ea59b2cbc4a3a9.tar.gz
base.bbclass: Update INCOMPATIBLE_LICENSE changes for gcc updates
Add in the TARGET_ARCH and SDK_ARCH suffixes from the gcc-cross changes. The -intermediate toolchain parts were canned a while ago so drop them. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f4f5321ac8..2468b03cce 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -521,10 +521,10 @@ python () {
bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split()
check_license = False if pn.startswith("nativesdk-") else True
- for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate",
- "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial",
- "-cross-canadian-" + d.getVar('TRANSLATED_TARGET_ARCH', True)]:
- if pn.endswith(t):
+ for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
+ "-crosssdk-${SDK_ARCH}", "-crosssdk-initial-${SDK_ARCH}",
+ "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
+ if pn.endswith(d.expand(t)):
check_license = False
if check_license and bad_licenses: