diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a9f6a644769..cd05ad2cb70 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -106,14 +106,14 @@ BUILD_LD_ARCH = "" BUILD_AS_ARCH = "" BUILD_EXEEXT = "" -HOST_ARCH = "${TARGET_ARCH}" -HOST_OS = "${TARGET_OS}" -HOST_VENDOR = "${TARGET_VENDOR}" +HOST_ARCH = "${TUNE_ARCH}" +HOST_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" +HOST_VENDOR = "-oe" HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" -HOST_PREFIX = "${TARGET_PREFIX}" -HOST_CC_ARCH = "${TARGET_CC_ARCH}" -HOST_LD_ARCH = "${TARGET_LD_ARCH}" -HOST_AS_ARCH = "${TARGET_AS_ARCH}" +HOST_PREFIX = "${HOST_SYS}-" +HOST_CC_ARCH = "${TUNE_CCARGS}" +HOST_LD_ARCH = "${TUNE_LDARGS}" +HOST_AS_ARCH = "${TUNE_ASARGS}" HOST_EXEEXT = "" TUNE_ARCH ??= "INVALID" @@ -127,14 +127,14 @@ ABIEXTENSION ??= "" USE_NLS ??= "yes" SDKUSE_NLS ??= "yes" -TARGET_ARCH = "${TUNE_ARCH}" -TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" -TARGET_VENDOR = "-oe" +TARGET_ARCH = "${HOST_ARCH}" +TARGET_OS = "${HOST_OS}" +TARGET_VENDOR = "${HOST_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -TARGET_PREFIX = "${TARGET_SYS}-" -TARGET_CC_ARCH = "${TUNE_CCARGS}" -TARGET_LD_ARCH = "${TUNE_LDARGS}" -TARGET_AS_ARCH = "${TUNE_ASARGS}" +TARGET_PREFIX = "${HOST_PREFIX}" +TARGET_CC_ARCH = "${HOST_CC_ARCH}" +TARGET_LD_ARCH = "${HOST_LD_ARCH}" +TARGET_AS_ARCH = "${HOST_AS_ARCH}" SDKMACHINE ??= "${BUILD_ARCH}" SDK_OS = "${BUILD_OS}" @@ -156,7 +156,7 @@ PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" # since machine specific packages are handled using multimachine PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH" -MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" ################################################################## # Date/time variables. @@ -365,10 +365,10 @@ PERSISTENT_DIR = "${TOPDIR}/cache" LOG_DIR = "${TMPDIR}/log" STAMPS_DIR ?= "${TMPDIR}/stamps" -STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" -STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" +STAMP = "${STAMPS_DIR}/${MULTIMACH_HOST_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_HOST_SYS}/${PN}/*-*" BASE_WORKDIR ?= "${TMPDIR}/work" -WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" +WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_HOST_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" S = "${WORKDIR}/${BP}" @@ -730,9 +730,9 @@ PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" # Pre-build configuration output BUILDCFG_HEADER = "Build Configuration${@" (mc:${BB_CURRENT_MC})" if d.getVar("BBMULTICONFIG") else ""}:" -BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING TARGET_SYS MACHINE DISTRO DISTRO_VERSION TUNE_FEATURES TARGET_FPU" +BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING HOST_SYS MACHINE DISTRO DISTRO_VERSION TUNE_FEATURES HOST_FPU" BUILDCFG_VARS[type] = "list" -BUILDCFG_NEEDEDVARS = "TARGET_ARCH TARGET_OS" +BUILDCFG_NEEDEDVARS = "HOST_ARCH HOST_OS" BUILDCFG_NEEDEDVARS[type] = "list" # Other @@ -760,14 +760,14 @@ DISTRO_NAME ??= "OpenEmbedded" # Overrides are processed left to right, so the ones that are named later take precedence. # You generally want them to go from least to most specific. This means that: -# A variable '<foo>:arm' overrides a variable '<foo>' when ${TARGET_ARCH} is arm. +# A variable '<foo>:arm' overrides a variable '<foo>' when ${HOST_ARCH} is arm. # A variable '<foo>:qemuarm' overrides '<foo>' and overrides '<foo>:arm' when ${MACHINE} is 'qemuarm'. # If you use combination ie '<foo>:qemuarm:arm', then '<foo>:qemuarm:arm' will override # '<foo>:qemuarm' and then '<foo>' will be overriden with that value from '<foo>:qemuarm'. # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. # This works for functions as well, they are really just variables. # -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +OVERRIDES = "${HOST_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" @@ -902,8 +902,8 @@ DISTRO[unexport] = "1" # including the flock command). The user's shell shouldn't affect our builds. SHELL[unexport] = "1" -# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed -TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH').replace("_", "-")}" +# Used by canadian-cross to handle string conversions on HOST_ARCH where needed +TRANSLATED_TARGET_ARCH ??= "${@d.getVar('HOST_ARCH').replace("_", "-")}" # Set a default umask to use for tasks for determinism BB_DEFAULT_UMASK = "022" |