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>
This commit is contained in:
Juro Bystricky
Richard Purdie
parent
2d35edfb5a
commit
cf882b6e3a
|
|
@ -485,7 +485,7 @@ python () {
|
|||
|
||||
check_license = False if pn.startswith("nativesdk-") else True
|
||||
for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
|
||||
"-crosssdk-${SDK_ARCH}", "-crosssdk-initial-${SDK_ARCH}",
|
||||
"-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}",
|
||||
"-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
|
||||
if pn.endswith(d.expand(t)):
|
||||
check_license = False
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
|
|||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
|
||||
PREFERRED_PROVIDER_gdb = "gdb"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_ARCH}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_ARCH}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_ARCH}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_ARCH}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_SYS}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
|
||||
|
||||
# Default libc config
|
||||
|
|
@ -33,8 +33,8 @@ LINUXLIBCVERSION ?= "4.8%"
|
|||
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ PACKAGES = ""
|
|||
PACKAGES_DYNAMIC = ""
|
||||
|
||||
STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
|
||||
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
|
||||
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
|
||||
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
|
||||
|
||||
do_configure () {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require glibc-ld.inc
|
|||
require glibc-testing.inc
|
||||
|
||||
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}:"
|
||||
|
||||
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
|
|||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
|
||||
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
|
||||
STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
|
||||
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -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}/"
|
||||
|
|
|
|||
|
|
@ -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}/"
|
||||
|
|
|
|||
|
|
@ -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 = ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue