Sync bbclass files with OE

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

1 files changed, 4 insertions, 2 deletions

diff --git a/openembedded/classes/kernel.bbclass b/openembedded/classes/kernel.bbclass
index 471acd4a61..ab8c03014f 100644
--- a/openembedded/classes/kernel.bbclass
+++ b/openembedded/classes/kernel.bbclass
@@ -163,6 +163,7 @@ kernel_do_install() {
                 oe_runmake SUBDIRS="scripts/genksyms"
         fi
 
+        install -d ${STAGING_KERNEL_DIR}
         cp -fR scripts ${STAGING_KERNEL_DIR}/
 }
 
@@ -193,7 +194,7 @@ ALLOW_EMPTY_kernel-image = "1"
 
 pkg_postinst_modules () {
 if [ -n "$D" ]; then
-        ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION}
+        ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION}
 else
         depmod -A
         update-modules || true
@@ -261,8 +262,9 @@ python populate_packages_prepend () {
                         kernelver_stripped = m.group(1)
                 path = bb.data.getVar("PATH", d, 1)
                 host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
+                major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1)
 
-                cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+                cmd = "PATH=\"%s\" %sdepmod-%s -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, major_version, dvar, dvar, kernelver, kernelver_stripped)
                 f = os.popen(cmd, 'r')
 
                 deps = {}