mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

image|kernel.bblass|module-init-tools: do not use depmod-2.6

Browse Source 
Change to only depend on virtual/*/depmod.
Change all calls to only use depmod.
Do not install depmod as depmod-2.6
Bump PR in module-init-tools-cross.

(From OE-Core rev: 351e352c2e44a3d8103594ca7e1d8404979a220c)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anders Darander
2011-07-01 15:07:58 +02:00
committed by Richard Purdie
parent 33ca841082
commit 586ccf2a3f
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+1 -1
View File
@@ -116,7 +116,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_SYS}-depmod-2.6 -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION ${TARGET_SYS}-depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
fi fi
${IMAGE_PREPROCESS_COMMAND} ${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass
+4 -6
View File
@@ -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-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod 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"
@@ -53,7 +53,6 @@ KERNEL_IMAGEDEST = "boot"
export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
KERNEL_VERSION = "${@get_kernelversion('${B}')}" KERNEL_VERSION = "${@get_kernelversion('${B}')}"
KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
KERNEL_LOCALVERSION ?= "" KERNEL_LOCALVERSION ?= ""
@@ -238,7 +237,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-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
else else
depmod -a depmod -a
fi fi
@@ -246,7 +245,7 @@ fi
pkg_postinst_modules () { pkg_postinst_modules () {
if [ -n "$D" ]; then if [ -n "$D" ]; then
${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
else else
depmod -a depmod -a
update-modules || true update-modules || true
@@ -319,9 +318,8 @@ python populate_packages_prepend () {
kernelver_stripped = m.group(1) kernelver_stripped = m.group(1)
path = bb.data.getVar("PATH", d, 1) path = bb.data.getVar("PATH", d, 1)
host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or "" host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1)
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) cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
f = os.popen(cmd, 'r') f = os.popen(cmd, 'r')
deps = {} deps = {}
meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
+1 -5
View File
@@ -1,12 +1,8 @@
require module-init-tools.inc require module-init-tools.inc
PR = "r1" PR = "r2"
inherit cross inherit cross
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
SRC_URI += "file://no-static-binaries.patch" SRC_URI += "file://no-static-binaries.patch"
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
do_install_append () {
mv ${D}${bindir}/${TARGET_PREFIX}depmod ${D}${bindir}/${TARGET_PREFIX}depmod-2.6
}