# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1248347915 0
# Node ID 71c7aacfbbb22e3b92acc633bf15b9b6d8c008cc
# Parent  c7e011e76409ebf90cc0562aa9d59b2094887b88
Upgrade: module-init-tools (3.9 to 3.10)

diff -r c7e011e76409 -r 71c7aacfbbb2 depmod/receipt
--- a/depmod/receipt	Thu Jul 23 19:03:45 2009 +0000
+++ b/depmod/receipt	Thu Jul 23 11:18:35 2009 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="depmod"
-VERSION="3.9"
+VERSION="3.10"
 CATEGORY="base-system"
 SHORT_DESC="Kernel modules dependancy tool."
 MAINTAINER="pascal.bellard@slitaz.org"
-DEPENDS="zlib lzlib"
+DEPENDS="glibc-base gcc-lib-base zlib lzlib"
 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/"
 WANTED="module-init-tools"
 
@@ -15,3 +15,14 @@
 	mkdir -p $fs/sbin
 	cp $_pkg/sbin/depmod $fs/sbin
 }
+
+# Busybox depmod symlink currently not included in the BusyBox package
+#pre_install()
+#{
+#	rm -f $1/sbin/depmod
+#}
+#
+#post_remove()
+#{
+#	ln -s /bin/busybox /sbin/depmod
+#}
diff -r c7e011e76409 -r 71c7aacfbbb2 module-init-tools/receipt
--- a/module-init-tools/receipt	Thu Jul 23 19:03:45 2009 +0000
+++ b/module-init-tools/receipt	Thu Jul 23 11:18:35 2009 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="module-init-tools"
-VERSION="3.9"
+VERSION="3.10"
 CATEGORY="base-system"
 SHORT_DESC="Kernel modules manipulation tools."
 MAINTAINER="pascal.bellard@slitaz.org"
-DEPENDS="zlib lzlib depmod"
+DEPENDS="glibc-base gcc-lib-base zlib lzlib depmod"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/"
 WGET_URL="${WEB_SITE}$TARBALL"
@@ -48,3 +48,24 @@
 	echo "# /etc/modprobe.conf: Modprobe config file." > $fs/etc/modprobe.conf
 	echo "#" >> $fs/etc/modprobe.conf
 }
+
+# Remove Busybox symlink before installing
+pre_install()
+{
+	rm -f $1/sbin/insmod
+	rm -f $1/sbin/modinfo
+	rm -f $1/sbin/modprobe
+	rm -f $1/sbin/rmmod
+	# BusyBox puts lsmod in /sbin, not /bin
+	rm -f $1/sbin/lsmod
+}
+
+post_remove()
+{
+	ln -s /bin/busybox /sbin/insmod
+	ln -s /bin/busybox /sbin/modinfo
+	ln -s /bin/busybox /sbin/modprobe
+	ln -s /bin/busybox /sbin/rmmod
+	# BusyBox puts lsmod in /sbin, not /bin
+	ln -s /bin/busybox /sbin/lsmod
+}
diff -r c7e011e76409 -r 71c7aacfbbb2 module-init-tools/stuff/depmod.u
--- a/module-init-tools/stuff/depmod.u	Thu Jul 23 19:03:45 2009 +0000
+++ b/module-init-tools/stuff/depmod.u	Thu Jul 23 11:18:35 2009 +0000
@@ -1,6 +1,6 @@
---- module-init-tools-3.9/depmod.c
-+++ module-init-tools-3.9/depmod.c
-@@ -395,16 +395,16 @@
+--- module-init-tools-3.10/depmod.c
++++ module-init-tools-3.10/depmod.c
+@@ -439,16 +439,16 @@
  {
  	struct module *i;
  
diff -r c7e011e76409 -r 71c7aacfbbb2 module-init-tools/stuff/lzlib.u
--- a/module-init-tools/stuff/lzlib.u	Thu Jul 23 19:03:45 2009 +0000
+++ b/module-init-tools/stuff/lzlib.u	Thu Jul 23 11:18:35 2009 +0000
@@ -1,5 +1,5 @@
---- module-init-tools-3.9/zlibsupport.c
-+++ module-init-tools-3.9/zlibsupport.c
+--- module-init-tools-3.10/zlibsupport.c
++++ module-init-tools-3.10/zlibsupport.c
 @@ -18,60 +18,40 @@
  #include "testing.h"