From fb4bf48db5e1a3bed0ef9e490656357c70ae2088 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 29 Apr 2006 22:16:05 +0000 Subject: Install depmod-2.4 and depmod-2.6 in cross staging instead of plain depmod so 2.4 and 2.6 kernel builds can coexist with multimachine (bug 581) --- classes/kernel.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c5f667747c..ab8c03014f 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -194,7 +194,7 @@ ALLOW_EMPTY_kernel-image = "1" pkg_postinst_modules () { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} else depmod -A update-modules || true @@ -262,8 +262,9 @@ 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 -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) + 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) f = os.popen(cmd, 'r') deps = {} -- cgit v1.2.3