Skip to contentSkip to conversation

fix the MACHINE_ARCH

PATCH Applied Qing He 2 participants 3 messages Apr 2, 2011 – Apr 4, 2011

lore
Share & tools
lore

Qing He

author
#0 lore raw

cover fix the MACHINE_ARCH

From: Qing He <[email protected]>

This small patch mangles all machine names that contains a '-', examples are "qemux86-64" and "mpc8135e-rdb".

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He <[email protected]>
---

Qing He (1):
bitbake.conf: fix MACHINE_ARCH

 meta/conf/bitbake.conf |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
author
#1 lore raw

PATCH 1/1 bitbake.conf: fix MACHINE_ARCH

From: Qing He <[email protected]>

Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946]

Signed-off-by Qing He <[email protected]>
---
 meta/conf/bitbake.conf |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
meta/conf/bitbake.conf +1 -2
index 56c7bbb..a825c17 100644
@@ -92,8 +92,7 @@ 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"
+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
Signature · 1 line
1.7.0
Applied
#2 lore raw
In reply to Qing He
Quoted 9 lines · Qing He

From: Qing He <[email protected]>

This small patch mangles all machine names that contains a '-', examples are "qemux86-64" and "mpc8135e-rdb".

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Quoted 7 lines

Thanks,
Qing He <[email protected]>
---

Qing He (1):
bitbake.conf: fix MACHINE_ARCH

Merged to master, thanks!

Richard