From patchwork Fri Jul 1 07:06:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: =?utf-8?q?=5Bv4=2C2/8=5D_image=C2=A1kernel=2Ebblass_module-init-to?= =?utf-8?q?ols=3A_do_not_use_depmod-2=2E6?= Date: Fri, 01 Jul 2011 07:06:15 -0000 From: Anders Darander X-Patchwork-Id: 6801 Message-Id: <106a0333973dd77eb65b27c269008fd748bf6ce5.1309503939.git.anders@chargestorm.se> To: Cc: Anders Darander 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. Signed-off-by: Anders Darander --- meta/classes/image.bbclass | 2 +- meta/classes/kernel.bbclass | 10 ++++------ .../module-init-tools-cross_3.12.bb | 6 +----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e77ec42..1768a0b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -116,7 +116,7 @@ fakeroot do_rootfs () { KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion` 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 ${IMAGE_PREPROCESS_COMMAND} diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 25f4855..c6fb465 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-${@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 INHIBIT_DEFAULT_DEPS = "1" @@ -53,7 +53,6 @@ KERNEL_IMAGEDEST = "boot" export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" KERNEL_VERSION = "${@get_kernelversion('${B}')}" -KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= "" @@ -232,7 +231,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi 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 depmod -a fi @@ -240,7 +239,7 @@ fi pkg_postinst_modules () { 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 depmod -a update-modules || true @@ -313,9 +312,8 @@ 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-%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') deps = {} diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb index 08bf1a9..5cbf9c5 100644 --- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb +++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb @@ -1,12 +1,8 @@ require module-init-tools.inc -PR = "r1" +PR = "r2" inherit cross PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" SRC_URI += "file://no-static-binaries.patch" EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - -do_install_append () { - mv ${D}${bindir}/${TARGET_PREFIX}depmod ${D}${bindir}/${TARGET_PREFIX}depmod-2.6 -}