summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2016-09-26 09:30:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-28 10:16:03 +0100
commitcf882b6e3abbbc437fc61be58f1265ae3fd4e1b2 (patch)
tree3d6f504a627efd03af27a072ce8ec6841aa2dcf2 /meta/recipes-devtools
parent2d35edfb5abed33b5b496a95e4535675cb76d6b4 (diff)
downloadpoky-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-devtools')
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial.inc2
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
index 788106f9e7..62c03d7240 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
@@ -2,7 +2,7 @@ require binutils-cross_${PV}.bb
2 2
3inherit crosssdk 3inherit crosssdk
4 4
5PN = "binutils-crosssdk-${TARGET_ARCH}" 5PN = "binutils-crosssdk-${SDK_SYS}"
6 6
7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
8 8
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 048b5302be..dcf22710ae 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -77,7 +77,7 @@ do_install () {
77 77
78 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 78 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
79 case ${PN} in 79 case ${PN} in
80 *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${TARGET_ARCH}) 80 *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${SDK_SYS})
81 dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS} 81 dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS}
82 hardlinkdir . $dest 82 hardlinkdir . $dest
83 ;; 83 ;;
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index c0b8751ede..87a8de9a85 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -188,7 +188,7 @@ do_install () {
188 188
189 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 189 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
190 case ${PN} in 190 case ${PN} in
191 *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${TARGET_ARCH}) 191 *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${SDK_SYS})
192 dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} 192 dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS}
193 hardlinkdir . $dest 193 hardlinkdir . $dest
194 ;; 194 ;;
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
index 7d2599cb6c..08eda5d4c7 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
@@ -1,6 +1,6 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-initial-${TARGET_ARCH}" 3PN = "gcc-crosssdk-initial-${SDK_SYS}"
4 4
5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 53f880f39b..cda2927794 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -1,6 +1,6 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-${TARGET_ARCH}" 3PN = "gcc-crosssdk-${SDK_SYS}"
4 4
5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc
index 59e8a62e7f..687a8a0b09 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial.inc
+++ b/meta/recipes-devtools/gcc/libgcc-initial.inc
@@ -5,7 +5,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
5LICENSE = "GPL-3.0-with-GCC-exception" 5LICENSE = "GPL-3.0-with-GCC-exception"
6 6
7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" 7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" 8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
9PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 9PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
10 10
11PACKAGES = "" 11PACKAGES = ""