summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianxun Zhang <jianxun.zhang@linux.intel.com>2016-01-12 13:53:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 15:44:56 +0000
commitc0e9f2d2b6db25f9bca73f8d3e037a0705a60305 (patch)
treeafcd4139f6ede435c341dd4c39d4b1084b68b603
parentf8508deb012b8bd53150818c706aa6032b3e1b20 (diff)
downloadpoky-c0e9f2d2b6db25f9bca73f8d3e037a0705a60305.tar.gz
kernel/kernel-arch: Explicitly mapping between i386/x86_64 and x86 for kernel ARCH
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>
-rw-r--r--meta/classes/kernel-arch.bbclass4
-rw-r--r--meta/classes/kernel.bbclass15
2 files changed, 15 insertions, 4 deletions
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index 3ed5986a52..d8b180ec49 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -21,7 +21,9 @@ def map_kernel_arch(a, d):
21 21
22 valid_archs = d.getVar('valid_archs', True).split() 22 valid_archs = d.getVar('valid_archs', True).split()
23 23
24 if re.match('(i.86|athlon|x86.64)$', a): return 'x86' 24 if re.match('i.86$', a): return 'i386'
25 elif re.match('x86.64$', a): return 'x86_64'
26 elif re.match('athlon$', a): return 'x86'
25 elif re.match('armeb$', a): return 'arm' 27 elif re.match('armeb$', a): return 'arm'
26 elif re.match('aarch64$', a): return 'arm64' 28 elif re.match('aarch64$', a): return 'arm64'
27 elif re.match('aarch64_be$', a): return 'arm64' 29 elif re.match('aarch64_be$', a): return 'arm64'
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 997376d126..5c3287bb98 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -317,9 +317,18 @@ do_shared_workdir () {
317 cp -fR include/generated/* $kerneldir/include/generated/ 317 cp -fR include/generated/* $kerneldir/include/generated/
318 fi 318 fi
319 319
320 if [ -d arch/${ARCH}/include/generated ]; then 320 # When ARCH is set to i386 or x86_64, we need to map ARCH to the real name of src
321 mkdir -p $kerneldir/arch/${ARCH}/include/generated/ 321 # dir (x86) under arch/ of kenrel tree, so that we can find correct source to copy.
322 cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/ 322
323 if [ "${ARCH}" = "i386" ] || [ "${ARCH}" = "x86_64" ]; then
324 KERNEL_SRCARCH=x86
325 else
326 KERNEL_SRCARCH=${ARCH}
327 fi
328
329 if [ -d arch/${KERNEL_SRCARCH}/include/generated ]; then
330 mkdir -p $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
331 cp -fR arch/${KERNEL_SRCARCH}/include/generated/* $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
323 fi 332 fi
324} 333}
325 334