image.bbclass,kernel.bbclass: Use kmod-native instead of module-init-tools-cross

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59ba0f820fc5d10f0074b7e33ae1aced1a60..46107315367f6277e677b158d74cf96a2b08e079 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -178,7 +178,7 @@ fakeroot do_rootfs () {
                KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
                mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-               ${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+               depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
        fi
 
        ${IMAGE_PREPROCESS_COMMAND}

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 908650c3e30ddc0fbea9bc65507f1d96a649c7cc..a85f13028cd5699eef28e11fad2294b5ef4538be 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"
@@ -269,7 +269,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
        mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-       ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
 else
        depmod -a
 fi
@@ -347,9 +347,8 @@ python populate_packages_prepend () {
                if m:
                        kernelver_stripped = m.group(1)
                path = d.getVar("PATH", True)
-               host_prefix = d.getVar("HOST_PREFIX", True) or ""
 
-               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\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
                f = os.popen(cmd, 'r')
 
                deps = {}