diff options
| -rw-r--r-- | meta/classes/base.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/cross.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/crosssdk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 1 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
7 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 02e1ff5b74..a984eae5bc 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -1,4 +1,5 @@ BB_DEFAULT_TASK ?= "build" +CLASSOVERRIDE ?= "class-target" inherit patch inherit staging diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index bbf8f161fd..ed53118a2f 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -8,7 +8,7 @@ # SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" - +CLASSOVERRIDE = "class-cross-canadian" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" # diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 8da30483f4..e998307236 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -4,6 +4,7 @@ inherit relocatable # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" +CLASSOVERRIDE = "class-cross" PACKAGES = "" PACKAGES_DYNAMIC = "" PACKAGES_DYNAMIC_virtclass-native = "" diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 67df236b2c..93aba7022e 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -1,5 +1,6 @@ inherit cross +CLASSOVERRIDE = "class-crosssdk" PACKAGE_ARCH = "${SDK_ARCH}" python () { # set TUNE_PKGARCH to SDK_ARCH diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index ffab971cbb..bca48d4637 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -97,6 +97,7 @@ PKG_CONFIG_SYSROOT_DIR = "" # we dont want libc-uclibc or libc-glibc to kick in for native recipes LIBCOVERRIDE = "" +CLASSOVERRIDE = "class-native" PATH =. "${COREBASE}/scripts/native-intercept:" diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 9e20834575..a58fce2040 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -8,6 +8,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # we dont want libc-uclibc or libc-glibc to kick in for nativesdk recipes LIBCOVERRIDE = "" +CLASSOVERRIDE = "class-nativesdk" # # Update PACKAGE_ARCH and PACKAGE_ARCHS diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 91fe070718..9f4e4d4449 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -637,7 +637,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # # This works for functions as well, they are really just environment variables. # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" +CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}" MACHINEOVERRIDES ?= "${MACHINE}" MACHINEOVERRIDES[vardepsexclude] = "MACHINE" |