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/recipes-core | |
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/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc-initial.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index ec21f105d0..2e3bc8104a 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc | |||
@@ -5,7 +5,7 @@ PACKAGES = "" | |||
5 | PACKAGES_DYNAMIC = "" | 5 | PACKAGES_DYNAMIC = "" |
6 | 6 | ||
7 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" | 7 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" |
8 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" | 8 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" |
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
10 | 10 | ||
11 | do_configure () { | 11 | do_configure () { |
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index bf1dccdeb8..e85c7044a0 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -3,7 +3,7 @@ require glibc-ld.inc | |||
3 | require glibc-testing.inc | 3 | require glibc-testing.inc |
4 | 4 | ||
5 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" | 5 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" |
6 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" | 6 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" |
7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
8 | 8 | ||
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc index 276b00fdc4..7ed931c6da 100644 --- a/meta/recipes-core/musl/musl.inc +++ b/meta/recipes-core/musl/musl.inc | |||
@@ -17,7 +17,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | |||
17 | INHIBIT_DEFAULT_DEPS = "1" | 17 | INHIBIT_DEFAULT_DEPS = "1" |
18 | 18 | ||
19 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" | 19 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" |
20 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" | 20 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" |
21 | 21 | ||
22 | 22 | ||
23 | FILES_SOLIBSDEV = "" | 23 | FILES_SOLIBSDEV = "" |