mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
bitbake.conf: fix MACHINE_ARCH
Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946] (From OE-Core rev: 69b3a11d90579bca687ad3461e7a5cd325079fe6) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -92,9 +92,9 @@ SDK_CC_ARCH = "${BUILD_CC_ARCH}"
|
||||
|
||||
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}"
|
||||
MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user