summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel
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:28 +0100
commit8de7f8045f28aecfe796afcdb013c557ce9d1372 (patch)
tree7d7c1a7ad2902cec7d25938303a3556d5df1c9da /meta/recipes-kernel
parent6b74f2461735272bd950a4f060dab6e778a36f92 (diff)
downloadopenembedded-core-8de7f8045f28aecfe796afcdb013c557ce9d1372.tar.gz
openembedded-core-8de7f8045f28aecfe796afcdb013c557ce9d1372.tar.bz2
openembedded-core-8de7f8045f28aecfe796afcdb013c557ce9d1372.tar.xz
openembedded-core-8de7f8045f28aecfe796afcdb013c557ce9d1372.zip
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 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')
-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 0970ca8e4..d9c4d8b52 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,11 +3,15 @@
require kmod.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
-PROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
-CONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+
+# to force user to remove old module-init-tools and replace them with kmod variants
+RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
# autotools set prefix to /usr, however we want them in /bin and /sbin
bindir = "${base_bindir}"