From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 12 Feb 2006 20:01:13 +0000 (+0000)
Subject: module-init-tools: change depmod removal - close #671
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5412618c5e867a36e9bc59a9b77a9aa890c3e29b;p=openembedded.git

module-init-tools: change depmod removal - close #671
- "update-alternative --remove depmod" moved to m-i-t-depmod prerm
- removed handling of depmod from m-i-t as it is handled in m-i-t-depmod
  already and user can have only depmod package installed
---

diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb
index bbd8cca1bf..b0d2f34e5e 100644
--- a/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -34,7 +34,7 @@ do_install() {
 
 pkg_postinst_module-init-tools() {
 #!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
 bn=`basename $f`
    update-alternatives --install /$f $bn /$f.26 60
 done
@@ -44,7 +44,7 @@ update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
 
 pkg_prerm_module-init-tools() {
 #!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
 bn=`basename $f`
    update-alternatives --remove $bn /$f.26
 done
@@ -57,7 +57,7 @@ pkg_postinst_module-init-tools-depmod() {
 update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
 }
 
-pkg_prerm_module-init-tools() {
+pkg_prerm_module-init-tools-depmod() {
 #!/bin/sh
 update-alternatives --remove depmod /sbin/depmod.26
 }