summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-01-31 00:35:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-06 10:21:19 +0100
commit74fcf61224dc3e12e753c5de793591677275dffd (patch)
treea7c1ad65f0c78ff360c35edb2c1659f9817815d7 /meta/classes
parent27bc204010b9dccb30847d7b3216f8b1e106f64e (diff)
downloadopenembedded-core-74fcf61224dc3e12e753c5de793591677275dffd.tar.gz
openembedded-core-74fcf61224dc3e12e753c5de793591677275dffd.tar.bz2
openembedded-core-74fcf61224dc3e12e753c5de793591677275dffd.tar.xz
openembedded-core-74fcf61224dc3e12e753c5de793591677275dffd.zip
image.bbclass,kernel.bbclass: Use kmod-native instead of module-init-tools-cross
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernel.bbclass7
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59ba0..461073153 100644
--- 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 908650c3e..a85f13028 100644
--- 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 = {}