summaryrefslogtreecommitdiffstats
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:39:07 +0100
commit413ab0ab0603807baae1241b2b81a48a55bafd94 (patch)
treec492760a9c379a771c01f88537ccb1fa98cab84f
parentecf2a8cecfe115feeb0737dc5797687b574caf74 (diff)
downloadpoky-413ab0ab0603807baae1241b2b81a48a55bafd94.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. (From OE-Core rev: 8a733097bddcf0868fb5f8ca08ea59b2cbc4a3a9) 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 () {
521 bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() 521 bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split()
522 522
523 check_license = False if pn.startswith("nativesdk-") else True 523 check_license = False if pn.startswith("nativesdk-") else True
524 for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", 524 for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
525 "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial", 525 "-crosssdk-${SDK_ARCH}", "-crosssdk-initial-${SDK_ARCH}",
526 "-cross-canadian-" + d.getVar('TRANSLATED_TARGET_ARCH', True)]: 526 "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
527 if pn.endswith(t): 527 if pn.endswith(d.expand(t)):
528 check_license = False 528 check_license = False
529 529
530 if check_license and bad_licenses: 530 if check_license and bad_licenses: