mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

kernel/kernel-arch: Explicitly mapping between i386/x86_64 and x86 for kernel ARCH

Browse Source 
For a bare-bone kernel recipe which specifies 32 bit x86 target,
a 64 bit .config will be generated from do_configure task when
building 32-bit qemux86, once all of these conditions are true:

* arch of host is x86_64
* kernel source tree used in build has commit ffee0de41 which
  actually chooses i386 or x86_64 defconfig by asking host when
  ARCH is "x86" (arch/x86/Makefile)
* bare-bone kernel recipe inherits directly from kernel without
  other special treatments.

Build will fail because of the mismatched kernel architecture.

The patch sets ARCH i386 or x86_64 explicitly to configure
task to avoid this host contamination. Kernel artifact is also
changed so that it can map i386 and x64 back to arch/x86 when
needed.

(From OE-Core rev: 8d310b24927d0f348fb431895f0583733db2aad0)

Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jianxun Zhang
2016-01-12 13:53:56 -08:00
committed by Richard Purdie
parent f8508deb01
commit c0e9f2d2b6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
meta/classes/kernel.bbclass
View File

@@ -317,9 +317,18 @@ do_shared_workdir () {
cp -fR include/generated/* $kerneldir/include/generated/
fi
if [ -d arch/${ARCH}/include/generated ]; then
mkdir -p $kerneldir/arch/${ARCH}/include/generated/
cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
# When ARCH is set to i386 or x86_64, we need to map ARCH to the real name of src
# dir (x86) under arch/ of kenrel tree, so that we can find correct source to copy.
if [ "${ARCH}" = "i386" ] || [ "${ARCH}" = "x86_64" ]; then
KERNEL_SRCARCH=x86
else
KERNEL_SRCARCH=${ARCH}
fi
if [ -d arch/${KERNEL_SRCARCH}/include/generated ]; then
mkdir -p $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
cp -fR arch/${KERNEL_SRCARCH}/include/generated/* $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
fi
}