classes: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@651 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 18 insertions, 3 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ad51c4e035..c81112ede7 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -109,6 +109,21 @@ kernel_do_stage() {
         mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia
         cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/
 
+        if [ -d drivers/crypto ]; then
+                mkdir -p ${STAGING_KERNEL_DIR}/drivers/crypto
+                cp -fR drivers/crypto/* ${STAGING_KERNEL_DIR}/drivers/crypto/
+        fi
+
+        if [ -d include/media ]; then
+                mkdir -p ${STAGING_KERNEL_DIR}/include/media
+                cp -fR include/media/* ${STAGING_KERNEL_DIR}/include/media/
+        fi
+
+        if [ -d include/acpi ]; then
+                mkdir -p ${STAGING_KERNEL_DIR}/include/acpi
+                cp -fR include/acpi/* ${STAGING_KERNEL_DIR}/include/acpi/
+        fi
+
         if [ -d include/sound ]; then
                 mkdir -p ${STAGING_KERNEL_DIR}/include/sound
                 cp -fR include/sound/* ${STAGING_KERNEL_DIR}/include/sound/
@@ -133,7 +148,7 @@ kernel_do_stage() {
         # Check if arch/${ARCH}/Makefile exists and install it
         if [ -e arch/${ARCH}/Makefile ]; then
                 install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}
-                install -m 0644 arch/${ARCH}/Makefile ${STAGING_KERNEL_DIR}/arch/${ARCH}
+                install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH}
         fi
         cp -fR include/config* ${STAGING_KERNEL_DIR}/include/   
         install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}
@@ -199,7 +214,7 @@ fi
 if [ -n "$D" ]; then
         ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION}
 else
-        depmod -A
+        depmod -a
 fi
 }
 
@@ -207,7 +222,7 @@ pkg_postinst_modules () {
 if [ -n "$D" ]; then
         ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION}
 else
-        depmod -A
+        depmod -a
         update-modules || true
 fi
 }