bitbake.conf: Whitelist MACHINE variable in PACKAGE_ARCHS

PACKAGE_ARCHS represents all compatible architectures for a given machine.
It makes no sense for this variable to change any task checksums as it doesn't
inject any machine dependency into any known task. Multimachine means machine
specific packages will be detected through other variables.

Before this patch, even native packaging tasks were ending up being marked as
machine specific.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 376e3cf384203364ca09194637dfa8bb25f77e1c..aa34008abe490f243bc10a06eb9ba64a48022852 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -93,6 +93,9 @@ 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))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
+# MACHINE shouldn't be included here as a variable dependency since machine specific 
+# packages are handled using multimachine
+PACKAGE_ARCHS[vardepsexclude] = "MACHINE"
 
 MULTIMACH_ARCH = "${PACKAGE_ARCH}"
 MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"