From a295a0442ea05e1a5cca01dc78eb9663ea3125d8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 15 Mar 2011 20:11:17 +0000 Subject: bitbake.conf/tune files: Adjust PACKAGE_EXTEA_ARCHS There is a problem with the current PACKAGE_EXTRA_ARCHS implementation since its impossible to control which extra architectures sort higher than TARGET_ARCH and which sort lower. In the x86 case for example, TARGET_ARCH might be "i586", i486 should be lower than this and i686 should be higher. There are also complications where its easy to inject duplicate entries into the variable. I tried various versions of this patch and concluded that it was simplest just to force the tune files to include TARGET_ARCH in the list in the right place if they're planning to customise it themselves. Other approaches with appends and prepends just complicated the code for no good reason. The TARGET_ARCH definitions should also move to the tune files but I'll leave this for a separate patch. (From OE-Core rev: d492ebf8b1801da99c679f465be98ce54fd3061a) Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf/bitbake.conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2cd115dfa0..4108e2e115 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -94,7 +94,8 @@ BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" MACHINE_ARCH_qemux86-64 = "qemux86_64" -PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" +PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" +PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" # MACHINE shouldn't be included here as a variable dependency since machine specific # packages are handled using multimachine PACKAGE_ARCHS[vardepsexclude] = "MACHINE" -- cgit v1.2.3-54-g00ecf