mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

SDK: Allow changing SDKMACHINE without wiping TMP folder

Browse Source 
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>
This commit is contained in:
Juro Bystricky
2016-09-26 09:30:52 -07:00
committed by Richard Purdie
parent 2d35edfb5a
commit cf882b6e3a
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
+1 -1
View File
@@ -2,7 +2,7 @@ require binutils-cross_${PV}.bb
inherit crosssdk
PN = "binutils-crosssdk-${TARGET_ARCH}"
PN = "binutils-crosssdk-${SDK_SYS}"
PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
meta/recipes-devtools/gcc/gcc-cross-initial.inc
+1 -1
View File
@@ -77,7 +77,7 @@ do_install () {
# gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
case ${PN} in
*gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${TARGET_ARCH})
*gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${SDK_SYS})
dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS}
hardlinkdir . $dest
;;
meta/recipes-devtools/gcc/gcc-cross.inc
+1 -1
View File
@@ -188,7 +188,7 @@ do_install () {
# gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
case ${PN} in
*gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${TARGET_ARCH})
*gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${SDK_SYS})
dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS}
hardlinkdir . $dest
;;
meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+1 -1
View File
@@ -1,6 +1,6 @@
inherit crosssdk
PN = "gcc-crosssdk-initial-${TARGET_ARCH}"
PN = "gcc-crosssdk-initial-${SDK_SYS}"
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
meta/recipes-devtools/gcc/gcc-crosssdk.inc
+1 -1
View File
@@ -1,6 +1,6 @@
inherit crosssdk
PN = "gcc-crosssdk-${TARGET_ARCH}"
PN = "gcc-crosssdk-${SDK_SYS}"
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
meta/recipes-devtools/gcc/libgcc-initial.inc
+1 -1
View File
@@ -5,7 +5,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
LICENSE = "GPL-3.0-with-GCC-exception"
STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
PACKAGES = ""