1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 74b593a034..ad85dc3861 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -86,7 +86,8 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS'
 TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
-PACKAGE_ARCH = "${HOST_ARCH}"
+BASE_PACKAGE_ARCH = "${HOST_ARCH}"
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_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}"

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 74b593a034..ad85dc3861 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf
@@ -86,7 +86,8 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS'
86	TARGET_PREFIX = "${TARGET_SYS}-"	86	TARGET_PREFIX = "${TARGET_SYS}-"
87	TARGET_CC_ARCH = ""	87	TARGET_CC_ARCH = ""
88		88
89	PACKAGE_ARCH = "${HOST_ARCH}"	89	BASE_PACKAGE_ARCH = "${HOST_ARCH}"
		90	PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
90	MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"	91	MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
91	PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"	92	PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
92		93