[oe-commits] Darren Hart : linux-yocto: Use PACKAGE_ARCH in build dir

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 54590cdb940b6145ac92729ebf9bb7e7e537f5e2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=54590cdb940b6145ac92729ebf9bb7e7e537f5e2

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Wed Feb  5 20:02:44 2014 -0800

linux-yocto: Use PACKAGE_ARCH in build dir

The current linux-yocto build dir (B) includes MACHINE. This has been
appropriate as kernels are typically built machine-specific. We have
recently introduced an intel-common type kernel which can be shared
across multiple machines sharing a common base (intel-core2-32,
intel-corei7-64). In these cases, the kernel is built for a something
more generic than MACHINE, and the current mechanism results in
something like this when building for MACHINE=sys940x (using intel-common):

tmp/work/core2-32-intel-common-poky-linux/linux-yocto-dev/ \
3.13++gitAUTOINC+e5d23e7879_889c6bec6b-r0/linux-sys940x-noemgd-standard-build

Note the descrepancy between core2-32-intel-common and
linux-sys940x-noemgd-standard-build. This becomes counterintuitive at
the very least when switching to another machine and attempting to reuse
this build. This patch swaps MACHINE for PACKAGE_ARCH (which is
typically MACHINE_ARCH for linux-yocto), resulting in the following
build path:

tmp/work/core2-32-intel-common-poky-linux/linux-yocto-dev/ \
3.13++gitAUTOINC+e5d23e7879_889c6bec6b-r0/linux-core2-32-intel-common-standard-build

The impact to existing MACHINEs is a replace of - with _ if MACHINE
contains one or more - charachters.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield at windriver.com>
Cc: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-kernel/linux/linux-yocto.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 2bee042..4ed3188 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -31,7 +31,7 @@ inherit kernel
 inherit kernel-yocto
 require linux-dtb.inc
 
-B = "${WORKDIR}/linux-${MACHINE}-${LINUX_KERNEL_TYPE}-build"
+B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"
 
 do_install_append(){
 	if [ -n "${KMETA}" ]; then