1 files changed, 12 insertions, 3 deletions

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
 }