diff options
-rw-r--r-- | meta/classes/kernel-arch.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/kernel.bbclass | 15 |
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 | ||