summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-11 14:44:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 14:36:30 +0100
commit5aa96bd0ef51b355d52e0fa1a62bb446d01c3583 (patch)
tree862766d7672934904ac9ac73e70958ffc90aed5a /meta/conf
parent4cb97ca18cf0dffcb30da01061deb7b72116b90f (diff)
downloadpoky-5aa96bd0ef51b355d52e0fa1a62bb446d01c3583.tar.gz
bitbake.conf/classes: Variable cleanup
This patch removes the variables BASE_PACKAGE_ARCH, BASEPKG_HOST_SYS, BASEPKG_TARGET_SYS and also removes the immediate assignments in several core classes as these are no longer required. This should make it clearer what some of the core variables do and simplfy some overly complex and confusing class code. (From OE-Core rev: d5521be2dcbaf213c140b0d12a4176380874426b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2954faa5d0..9d1c7690bc 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -98,8 +98,7 @@ SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), '']
98SDK_PREFIX = "${SDK_SYS}-" 98SDK_PREFIX = "${SDK_SYS}-"
99SDK_CC_ARCH = "${BUILD_CC_ARCH}" 99SDK_CC_ARCH = "${BUILD_CC_ARCH}"
100 100
101BASE_PACKAGE_ARCH = "${TUNE_PKGARCH}" 101PACKAGE_ARCH = "${TUNE_PKGARCH}"
102PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
103MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}" 102MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
104PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" 103PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
105PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 104PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
@@ -109,8 +108,6 @@ PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
109 108
110MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 109MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
111MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" 110MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
112BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
113BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
114 111
115# select proper CPU to get binary locales generated 112# select proper CPU to get binary locales generated
116QEMU_OPTIONS = "" 113QEMU_OPTIONS = ""
@@ -317,7 +314,7 @@ STAGING_DIR = "${TMPDIR}/sysroots"
317STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 314STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
318STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" 315STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
319STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" 316STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
320STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}" 317STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
321STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" 318STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
322STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" 319STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
323STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 320STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"