summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-07-01 15:07:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 23:34:17 +0100
commit586ccf2a3f80cafe7a55e58da4f5121935d9a23f (patch)
tree61ba97e6d1df7ac749c50a127eb34d90afa58e02 /meta/classes
parent33ca841082c90aef3c28fa08f1b0d56719d178ac (diff)
downloadpoky-586ccf2a3f80cafe7a55e58da4f5121935d9a23f.tar.gz
image|kernel.bblass|module-init-tools: do not use depmod-2.6
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernel.bbclass10
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index e77ec427fc..1768a0bda3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -116,7 +116,7 @@ fakeroot do_rootfs () {
116 KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion` 116 KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
117 117
118 mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION 118 mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
119 ${TARGET_SYS}-depmod-2.6 -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION 119 ${TARGET_SYS}-depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
120 fi 120 fi
121 121
122 ${IMAGE_PREPROCESS_COMMAND} 122 ${IMAGE_PREPROCESS_COMMAND}
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index f23f0273eb..943252ab99 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -1,7 +1,7 @@
1inherit linux-kernel-base module_strip 1inherit linux-kernel-base module_strip
2 2
3PROVIDES += "virtual/kernel" 3PROVIDES += "virtual/kernel"
4DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" 4DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
5 5
6# we include gcc above, we dont need virtual/libc 6# we include gcc above, we dont need virtual/libc
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
@@ -53,7 +53,6 @@ KERNEL_IMAGEDEST = "boot"
53export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" 53export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
54 54
55KERNEL_VERSION = "${@get_kernelversion('${B}')}" 55KERNEL_VERSION = "${@get_kernelversion('${B}')}"
56KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
57 56
58KERNEL_LOCALVERSION ?= "" 57KERNEL_LOCALVERSION ?= ""
59 58
@@ -238,7 +237,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
238 mkdir -p $D/lib/modules/${KERNEL_VERSION} 237 mkdir -p $D/lib/modules/${KERNEL_VERSION}
239fi 238fi
240if [ -n "$D" ]; then 239if [ -n "$D" ]; then
241 ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} 240 ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
242else 241else
243 depmod -a 242 depmod -a
244fi 243fi
@@ -246,7 +245,7 @@ fi
246 245
247pkg_postinst_modules () { 246pkg_postinst_modules () {
248if [ -n "$D" ]; then 247if [ -n "$D" ]; then
249 ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} 248 ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
250else 249else
251 depmod -a 250 depmod -a
252 update-modules || true 251 update-modules || true
@@ -319,9 +318,8 @@ python populate_packages_prepend () {
319 kernelver_stripped = m.group(1) 318 kernelver_stripped = m.group(1)
320 path = bb.data.getVar("PATH", d, 1) 319 path = bb.data.getVar("PATH", d, 1)
321 host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or "" 320 host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
322 major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1)
323 321
324 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) 322 cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
325 f = os.popen(cmd, 'r') 323 f = os.popen(cmd, 'r')
326 324
327 deps = {} 325 deps = {}