diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2016-09-26 09:30:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 10:16:03 +0100 |
commit | cf882b6e3abbbc437fc61be58f1265ae3fd4e1b2 (patch) | |
tree | 3d6f504a627efd03af27a072ce8ec6841aa2dcf2 /meta/classes/base.bbclass | |
parent | 2d35edfb5abed33b5b496a95e4535675cb76d6b4 (diff) | |
download | poky-cf882b6e3abbbc437fc61be58f1265ae3fd4e1b2.tar.gz |
SDK: Allow changing SDKMACHINE without wiping TMP folder
When changing SDKMACHINE, we may encounter an error forcing us to wipe the TMP folder.
Since only SDK_ARCH is captured in the PN of the crosssdk recipes, changes to SDK_OS
result in conflicts. Eventually we hit the error:
ERROR: ...: The recipe <...> is trying to install files into a shared area when those files already exist.
The build has stopped as continuing in this scenario WILL break things
This patchset addresses the problem by SDK_SYS as the recipe name suffix instead
of SDK_ARCH.
[YOCTO #9281]
(From OE-Core rev: d2eccccb70e809d482c493922f23aef4409cfd82)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index ea0710fe72..21957d84a1 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -485,7 +485,7 @@ python () { | |||
485 | 485 | ||
486 | check_license = False if pn.startswith("nativesdk-") else True | 486 | check_license = False if pn.startswith("nativesdk-") else True |
487 | for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}", | 487 | for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}", |
488 | "-crosssdk-${SDK_ARCH}", "-crosssdk-initial-${SDK_ARCH}", | 488 | "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}", |
489 | "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: | 489 | "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: |
490 | if pn.endswith(d.expand(t)): | 490 | if pn.endswith(d.expand(t)): |
491 | check_license = False | 491 | check_license = False |