* [PATCH 0/1] fix the MACHINE_ARCH
@ 2011-04-02 8:03 Qing He
2011-04-02 8:03 ` [PATCH 1/1] bitbake.conf: fix MACHINE_ARCH Qing He
2011-04-04 13:12 ` [PATCH 0/1] fix the MACHINE_ARCH Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Qing He @ 2011-04-02 8:03 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
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 <qing.he@intel.com>
---
Qing He (1):
bitbake.conf: fix MACHINE_ARCH
meta/conf/bitbake.conf | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] bitbake.conf: fix MACHINE_ARCH
2011-04-02 8:03 [PATCH 0/1] fix the MACHINE_ARCH Qing He
@ 2011-04-02 8:03 ` Qing He
2011-04-04 13:12 ` [PATCH 0/1] fix the MACHINE_ARCH Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Qing He @ 2011-04-02 8:03 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946]
Signed-off-by: Qing He <qing.he@intel.com>
---
meta/conf/bitbake.conf | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 56c7bbb..a825c17 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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
--
1.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] fix the MACHINE_ARCH
2011-04-02 8:03 [PATCH 0/1] fix the MACHINE_ARCH Qing He
2011-04-02 8:03 ` [PATCH 1/1] bitbake.conf: fix MACHINE_ARCH Qing He
@ 2011-04-04 13:12 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-04-04 13:12 UTC (permalink / raw)
To: Qing He; +Cc: poky
On Sat, 2011-04-02 at 16:03 +0800, Qing He wrote:
> From: Qing He <qing.he@intel.com>
>
> 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 <qing.he@intel.com>
> ---
>
>
> Qing He (1):
> bitbake.conf: fix MACHINE_ARCH
Merged to master, thanks!
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-04 13:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-02 8:03 [PATCH 0/1] fix the MACHINE_ARCH Qing He
2011-04-02 8:03 ` [PATCH 1/1] bitbake.conf: fix MACHINE_ARCH Qing He
2011-04-04 13:12 ` [PATCH 0/1] fix the MACHINE_ARCH Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.