module-init-tools: Upgrade to 3.2pre9. Change the update-alternatives priority so the genuine tool takes priority over busybox. This gets pcmciatils working properly.

4 files changed, 11 insertions, 9 deletions

diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty
+++ b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
index 185ea7a3a5..185ea7a3a5 100644
--- a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory
+++ b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
index ee1454c6ef..5d5cac609e 100644
--- a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt
+++ b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
@@ -1,7 +1,7 @@
-Index: module-init-tools-3.1/configure.in
+Index: module-init-tools-3.2-pre9/configure.in
 ===================================================================
---- module-init-tools-3.1.orig/configure.in	2004-11-12 00:05:25.000000000 -0500
-+++ module-init-tools-3.1/configure.in	2005-01-20 02:23:16.409792288 -0500
+--- module-init-tools-3.2-pre9.orig/configure.in	2005-08-09 04:31:26.000000000 +0000
++++ module-init-tools-3.2-pre9/configure.in	2005-09-20 22:06:10.000000000 +0000
 @@ -41,5 +41,14 @@
  fi])
  AC_SUBST(MODULE_DIR)
@@ -18,8 +18,10 @@ Index: module-init-tools-3.1/configure.in
 +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
  
 +AC_OUTPUT([Makefile])
---- module-init-tools-3.2-pre7/Makefile.am.orig	2005-07-05 13:55:06.000000000 +0200
-+++ module-init-tools-3.2-pre7/Makefile.am	2005-07-05 13:55:31.000000000 +0200
+Index: module-init-tools-3.2-pre9/Makefile.am
+===================================================================
+--- module-init-tools-3.2-pre9.orig/Makefile.am	2005-08-09 04:54:28.000000000 +0000
++++ module-init-tools-3.2-pre9/Makefile.am	2005-09-20 22:09:03.000000000 +0000
 @@ -21,13 +21,14 @@
  MAN5 = modprobe.conf.5 modules.dep.5
  MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
@@ -28,7 +30,7 @@ Index: module-init-tools-3.1/configure.in
  # If they haven't overridden mandir, fix it (never /man!)
  mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
  
- TESTSUITE := $(shell find tests -type f ! -name '*~')
+ TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
  
 -EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
 +if MANPAGES
diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre9.bb
index 017f288e7d..bbd8cca1bf 100644
--- a/packages/module-init-tools/module-init-tools_3.2-pre7.bb
+++ b/packages/module-init-tools/module-init-tools_3.2-pre9.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 = "r1"
+PR = "r0"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -36,7 +36,7 @@ pkg_postinst_module-init-tools() {
 #!/bin/sh
 for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
 bn=`basename $f`
-   update-alternatives --install /$f $bn /$f.26 20
+   update-alternatives --install /$f $bn /$f.26 60
 done
 update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
 update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
@@ -54,7 +54,7 @@ update-alternatives --remove lsmod /bin/lsmod.26
 
 pkg_postinst_module-init-tools-depmod() {
 #!/bin/sh
-update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
 }
 
 pkg_prerm_module-init-tools() {