summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel-arch.bbclass4
-rw-r--r--meta/classes/kernel.bbclass15
2 files changed, 4 insertions, 15 deletions
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index d8b180ec49..3ed5986a52 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -21,9 +21,7 @@ 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$', a): return 'i386' 24 if re.match('(i.86|athlon|x86.64)$', a): return 'x86'
25 elif re.match('x86.64$', a): return 'x86_64'
26 elif re.match('athlon$', a): return 'x86'
27 elif re.match('armeb$', a): return 'arm' 25 elif re.match('armeb$', a): return 'arm'
28 elif re.match('aarch64$', a): return 'arm64' 26 elif re.match('aarch64$', a): return 'arm64'
29 elif re.match('aarch64_be$', a): return 'arm64' 27 elif re.match('aarch64_be$', a): return 'arm64'
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ee3e9a0d94..5e8b6cf343 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -309,18 +309,9 @@ do_shared_workdir () {
309 cp -fR include/generated/* $kerneldir/include/generated/ 309 cp -fR include/generated/* $kerneldir/include/generated/
310 fi 310 fi
311 311
312 # When ARCH is set to i386 or x86_64, we need to map ARCH to the real name of src 312 if [ -d arch/${ARCH}/include/generated ]; then
313 # dir (x86) under arch/ of kenrel tree, so that we can find correct source to copy. 313 mkdir -p $kerneldir/arch/${ARCH}/include/generated/
314 314 cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
315 if [ "${ARCH}" = "i386" ] || [ "${ARCH}" = "x86_64" ]; then
316 KERNEL_SRCARCH=x86
317 else
318 KERNEL_SRCARCH=${ARCH}
319 fi
320
321 if [ -d arch/${KERNEL_SRCARCH}/include/generated ]; then
322 mkdir -p $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
323 cp -fR arch/${KERNEL_SRCARCH}/include/generated/* $kerneldir/arch/${KERNEL_SRCARCH}/include/generated/
324 fi 315 fi
325} 316}
326 317