summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kmod
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-05-08 15:53:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-09 21:01:52 +0100
commitbc84461b32aa4f96a83a89c8da993e731b1ea8fd (patch)
tree378c95cbb0ccea70dc7d3f6dd22034c64f459ecb /meta/recipes-kernel/kmod
parent6b5dbc8e335b81ad30ceeddedde6cbd354f89e59 (diff)
downloadpoky-bc84461b32aa4f96a83a89c8da993e731b1ea8fd.tar.gz
kmod: fix upgrade path from module-init-tools
* PROVIDES does not need _${PN} * CONFLICTS should be RCONFLICTS * opkg needs RREPLACES to automatically remove older module-init-tools instead of just reporting it conflicts with kmod SHR root@gjama ~ $ opkg install kmod Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root... Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk. Removing package module-init-tools-depmod from root... update-alternatives: removing //sbin/depmod as no more alternatives exist for it Removing package module-init-tools from root... update-alternatives: Linking //sbin/insmod to ../bin/busybox update-alternatives: Linking //sbin/modprobe to ../bin/busybox update-alternatives: Linking //sbin/rmmod to ../bin/busybox update-alternatives: removing //sbin/modinfo as no more alternatives exist for it update-alternatives: removing //bin/lsmod as no more alternatives exist for it update-alternatives: Linking //sbin/lsmod to ../bin/busybox Configuring kmod. update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod (From OE-Core rev: 8de7f8045f28aecfe796afcdb013c557ce9d1372) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod')
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 0970ca8e4b..d9c4d8b525 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,11 +3,15 @@
3 3
4require kmod.inc 4require kmod.inc
5 5
6PR = "${INC_PR}.0" 6PR = "${INC_PR}.1"
7 7
8PROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 8PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
9RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 9RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
10CONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 10RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
11RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
12
13# to force user to remove old module-init-tools and replace them with kmod variants
14RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
11 15
12# autotools set prefix to /usr, however we want them in /bin and /sbin 16# autotools set prefix to /usr, however we want them in /bin and /sbin
13bindir = "${base_bindir}" 17bindir = "${base_bindir}"