summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 16:10:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:55:39 +0100
commit1d2f3957b5c1e90b0e57ddb2488594e2db65e320 (patch)
treebd535953ea1669d80ee5bf4689cfe246bedbfb5d /meta/conf
parent371a224c1ee6e105ac5969a35373d47b2ac70265 (diff)
downloadpoky-1d2f3957b5c1e90b0e57ddb2488594e2db65e320.tar.gz
classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose
(From OE-Core rev: e623d3015bbdeb2b42b9763937be899a1fa9c0ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6d8a674d6c..ff2a912a47 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -99,9 +99,8 @@ PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
99# since machine specific packages are handled using multimachine 99# since machine specific packages are handled using multimachine
100PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH" 100PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
101 101
102MULTIMACH_ARCH = "${PACKAGE_ARCH}" 102MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
103MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 103MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
104MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
105BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" 104BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
106BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 105BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
107 106
@@ -317,8 +316,6 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
317STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 316STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
318STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" 317STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
319 318
320# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
321# specific packages - hack around it for now.
322STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}" 319STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}"
323STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}" 320STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
324STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}" 321STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
@@ -329,8 +326,6 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
329STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 326STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
330STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 327STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
331 328
332# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
333# specific packages - hack around it for now.
334STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}" 329STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}"
335STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap" 330STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap"
336 331