From 8de7f8045f28aecfe796afcdb013c557ce9d1372 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 8 May 2012 15:53:38 -0700 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-kernel/kmod/kmod_git.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/kmod/kmod_git.bb') 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}" -- cgit v1.2.3