wok-6.x rev 3742
Upgrade: module-init-tools (3.9 to 3.10)
author | Matthew Sheets <rcx@zoominternet.net> |
---|---|
date | Thu Jul 23 11:18:35 2009 +0000 (2009-07-23) |
parents | c7e011e76409 |
children | 303e30733e97 |
files | depmod/receipt module-init-tools/receipt module-init-tools/stuff/depmod.u module-init-tools/stuff/lzlib.u |
line diff
1.1 --- a/depmod/receipt Thu Jul 23 19:03:45 2009 +0000 1.2 +++ b/depmod/receipt Thu Jul 23 11:18:35 2009 +0000 1.3 @@ -1,11 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="depmod" 1.7 -VERSION="3.9" 1.8 +VERSION="3.10" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="Kernel modules dependancy tool." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 -DEPENDS="zlib lzlib" 1.13 +DEPENDS="glibc-base gcc-lib-base zlib lzlib" 1.14 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/" 1.15 WANTED="module-init-tools" 1.16 1.17 @@ -15,3 +15,14 @@ 1.18 mkdir -p $fs/sbin 1.19 cp $_pkg/sbin/depmod $fs/sbin 1.20 } 1.21 + 1.22 +# Busybox depmod symlink currently not included in the BusyBox package 1.23 +#pre_install() 1.24 +#{ 1.25 +# rm -f $1/sbin/depmod 1.26 +#} 1.27 +# 1.28 +#post_remove() 1.29 +#{ 1.30 +# ln -s /bin/busybox /sbin/depmod 1.31 +#}
2.1 --- a/module-init-tools/receipt Thu Jul 23 19:03:45 2009 +0000 2.2 +++ b/module-init-tools/receipt Thu Jul 23 11:18:35 2009 +0000 2.3 @@ -1,11 +1,11 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="module-init-tools" 2.7 -VERSION="3.9" 2.8 +VERSION="3.10" 2.9 CATEGORY="base-system" 2.10 SHORT_DESC="Kernel modules manipulation tools." 2.11 MAINTAINER="pascal.bellard@slitaz.org" 2.12 -DEPENDS="zlib lzlib depmod" 2.13 +DEPENDS="glibc-base gcc-lib-base zlib lzlib depmod" 2.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.15 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/" 2.16 WGET_URL="${WEB_SITE}$TARBALL" 2.17 @@ -48,3 +48,24 @@ 2.18 echo "# /etc/modprobe.conf: Modprobe config file." > $fs/etc/modprobe.conf 2.19 echo "#" >> $fs/etc/modprobe.conf 2.20 } 2.21 + 2.22 +# Remove Busybox symlink before installing 2.23 +pre_install() 2.24 +{ 2.25 + rm -f $1/sbin/insmod 2.26 + rm -f $1/sbin/modinfo 2.27 + rm -f $1/sbin/modprobe 2.28 + rm -f $1/sbin/rmmod 2.29 + # BusyBox puts lsmod in /sbin, not /bin 2.30 + rm -f $1/sbin/lsmod 2.31 +} 2.32 + 2.33 +post_remove() 2.34 +{ 2.35 + ln -s /bin/busybox /sbin/insmod 2.36 + ln -s /bin/busybox /sbin/modinfo 2.37 + ln -s /bin/busybox /sbin/modprobe 2.38 + ln -s /bin/busybox /sbin/rmmod 2.39 + # BusyBox puts lsmod in /sbin, not /bin 2.40 + ln -s /bin/busybox /sbin/lsmod 2.41 +}
3.1 --- a/module-init-tools/stuff/depmod.u Thu Jul 23 19:03:45 2009 +0000 3.2 +++ b/module-init-tools/stuff/depmod.u Thu Jul 23 11:18:35 2009 +0000 3.3 @@ -1,6 +1,6 @@ 3.4 ---- module-init-tools-3.9/depmod.c 3.5 -+++ module-init-tools-3.9/depmod.c 3.6 -@@ -395,16 +395,16 @@ 3.7 +--- module-init-tools-3.10/depmod.c 3.8 ++++ module-init-tools-3.10/depmod.c 3.9 +@@ -439,16 +439,16 @@ 3.10 { 3.11 struct module *i; 3.12
4.1 --- a/module-init-tools/stuff/lzlib.u Thu Jul 23 19:03:45 2009 +0000 4.2 +++ b/module-init-tools/stuff/lzlib.u Thu Jul 23 11:18:35 2009 +0000 4.3 @@ -1,5 +1,5 @@ 4.4 ---- module-init-tools-3.9/zlibsupport.c 4.5 -+++ module-init-tools-3.9/zlibsupport.c 4.6 +--- module-init-tools-3.10/zlibsupport.c 4.7 ++++ module-init-tools-3.10/zlibsupport.c 4.8 @@ -18,60 +18,40 @@ 4.9 #include "testing.h" 4.10