diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-02-05 20:02:44 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:58:31 +0000 |
| commit | 5518885e41e884a98009310dbda174e6fbccb10e (patch) | |
| tree | 8f649d9133979a6a1770c0a7ebd751d00d5cb447 | |
| parent | ab9c3456f555aff89c2eb7996e85b62b3fefa83e (diff) | |
| download | poky-5518885e41e884a98009310dbda174e6fbccb10e.tar.gz | |
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.
(From OE-Core rev: 54590cdb940b6145ac92729ebf9bb7e7e537f5e2)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 2bee042775..4ed318886f 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
| @@ -31,7 +31,7 @@ inherit kernel | |||
| 31 | inherit kernel-yocto | 31 | inherit kernel-yocto |
| 32 | require linux-dtb.inc | 32 | require linux-dtb.inc |
| 33 | 33 | ||
| 34 | B = "${WORKDIR}/linux-${MACHINE}-${LINUX_KERNEL_TYPE}-build" | 34 | B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" |
| 35 | 35 | ||
| 36 | do_install_append(){ | 36 | do_install_append(){ |
| 37 | if [ -n "${KMETA}" ]; then | 37 | if [ -n "${KMETA}" ]; then |