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):
 
     valid_archs = d.getVar('valid_archs', True).split()
 
-    if   re.match('(i.86|athlon|x86.64)$', a):  return 'x86'
+    if   re.match('i.86$', a):                  return 'i386'
+    elif re.match('x86.64$', a):                return 'x86_64'
+    elif re.match('athlon$', a):                return 'x86'
     elif re.match('armeb$', a):                 return 'arm'
     elif re.match('aarch64$', a):               return 'arm64'
     elif re.match('aarch64_be$', a):            return 'arm64'
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5e8b6cf343..ee3e9a0d94 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -309,9 +309,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
 }