aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-08-08 14:39:13 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-08-08 14:39:13 +0000
commit884601dff03b42a3b8f34d53bf065a727d1ec2d4 (patch)
tree20e6b8416701d9d8787907cc42c6550821b45e6e
parente0dffc454a17ac6bbd85f4d3a9861916bf00c334 (diff)
downloadopenembedded-884601dff03b42a3b8f34d53bf065a727d1ec2d4.tar.gz
{module-init-tools,modutils}-cross, kernel.bbclass: stage depmod-2.{4,6} instead of depmod - close #524
-rw-r--r--classes/kernel.bbclass3
-rw-r--r--packages/module-init-tools/module-init-tools-cross_3.2.2.bb2
-rw-r--r--packages/modutils/modutils-cross_2.4.27.bb3
3 files changed, 6 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 93ce2c8975..587c9a1579 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -238,8 +238,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 = {}
diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index 4bcc311709..b025b78145 100644
--- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -3,11 +3,13 @@ include module-init-tools_${PV}.bb
inherit cross
DEFAULT_PREFERENCE = "0"
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+PR = "r1"
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
do_stage () {
oe_runmake install
+ mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6
}
do_install () {
diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb
index 2b301d7d09..834f13adbd 100644
--- a/packages/modutils/modutils-cross_2.4.27.bb
+++ b/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,6 +1,6 @@
SECTION = "base"
include modutils_${PV}.bb
-PR = "r6"
+PR = "r8"
inherit cross
S = "${WORKDIR}/modutils-${PV}"
DEPENDS = ""
@@ -19,6 +19,7 @@ CFLAGS_prepend_mipseb = "-D__MIPSEB__"
do_stage () {
oe_runmake install
+ mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.4
}
do_install () {