mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
image.bbclass,kernel.bbclass: Use kmod-native instead of module-init-tools-cross
(From OE-Core rev: 74fcf61224dc3e12e753c5de793591677275dffd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -178,7 +178,7 @@ fakeroot do_rootfs () {
|
|||||||
KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
|
KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
|
||||||
|
|
||||||
mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
|
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
|
fi
|
||||||
|
|
||||||
${IMAGE_PREPROCESS_COMMAND}
|
${IMAGE_PREPROCESS_COMMAND}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
inherit linux-kernel-base module_strip
|
inherit linux-kernel-base module_strip
|
||||||
|
|
||||||
PROVIDES += "virtual/kernel"
|
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
|
# we include gcc above, we dont need virtual/libc
|
||||||
INHIBIT_DEFAULT_DEPS = "1"
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
@@ -269,7 +269,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
|
|||||||
mkdir -p $D/lib/modules/${KERNEL_VERSION}
|
mkdir -p $D/lib/modules/${KERNEL_VERSION}
|
||||||
fi
|
fi
|
||||||
if [ -n "$D" ]; then
|
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
|
else
|
||||||
depmod -a
|
depmod -a
|
||||||
fi
|
fi
|
||||||
@@ -347,9 +347,8 @@ python populate_packages_prepend () {
|
|||||||
if m:
|
if m:
|
||||||
kernelver_stripped = m.group(1)
|
kernelver_stripped = m.group(1)
|
||||||
path = d.getVar("PATH", True)
|
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')
|
f = os.popen(cmd, 'r')
|
||||||
|
|
||||||
deps = {}
|
deps = {}
|
||||||
|
|||||||
Reference in New Issue
Block a user