diff options
Diffstat (limited to 'source/a/module-init-tools')
4 files changed, 16 insertions, 28 deletions
diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh new file mode 100644 index 000000000..f455be891 --- /dev/null +++ b/source/a/module-init-tools/doinst.sh @@ -0,0 +1,7 @@ +# Remove/move obsolete configuration: +if [ -L etc/modprobe.d/modprobe.conf ]; then + rm -f etc/modprobe.d/modprobe.conf +fi +if [ -e etc/modprobe.conf ]; then + mv etc/modprobe.conf etc/modprobe.conf.obsolete +fi diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff index a65fba0ad..5517502b7 100644 --- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff +++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff @@ -1,6 +1,6 @@ -diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modprobe.c ---- module-init-tools-3.11.orig/modprobe.c 2009-10-15 04:59:28.000000000 -0500 -+++ module-init-tools-3.11.new/modprobe.c 2009-10-15 08:14:12.108359199 -0500 +diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c +--- module-init-tools-3.12.orig//modprobe.c 2010-05-04 00:19:27.000000000 -0500 ++++ module-init-tools-3.12/modprobe.c 2010-06-08 04:32:46.655088739 -0500 @@ -38,6 +38,7 @@ #include <asm/unistd.h> #include <sys/wait.h> @@ -9,8 +9,8 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp #include "util.h" #include "elfops.h" -@@ -861,6 +862,20 @@ - options, commands, aliases, blacklist); +@@ -789,6 +790,20 @@ + return strsep(string, delim); } +/* Let's exclude a few file extensions */ @@ -28,9 +28,9 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp +} + static int parse_config_scan(const char *filename, - const char *name, + struct modprobe_conf *conf, int dump_only, -@@ -887,6 +902,8 @@ +@@ -1066,6 +1081,8 @@ while ((i = readdir(dir)) != NULL) { size_t len; diff --git a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff b/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff deleted file mode 100644 index 640ab3086..000000000 --- a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./modprobe.c.orig 2010-02-06 13:56:19.000000000 -0600 -+++ ./modprobe.c 2010-02-06 14:00:49.000000000 -0600 -@@ -971,10 +971,8 @@ - } - - /* deprecated config file */ -- if (parse_config_file("/etc/modprobe.conf", name, dump_only, removing, -- options, commands, aliases, blacklist) > 0) -- warn("Deprecated config file /etc/modprobe.conf, " -- "all config files belong into /etc/modprobe.d/.\n"); -+ parse_config_file("/etc/modprobe.conf", name, dump_only, removing, -+ options, commands, aliases, blacklist); - - /* default config */ - parse_config_scan("/etc/modprobe.d", name, dump_only, removing, diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild index 9b390d11a..a8dc73ab3 100755 --- a/source/a/module-init-tools/module-init-tools.SlackBuild +++ b/source/a/module-init-tools/module-init-tools.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} @@ -58,11 +58,6 @@ find . \ # valid for this... Thanks to Marco d'Itri for the patch that it's based on zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 || exit 1 -# Using modprobe.conf still works, so don't whine about it, -# especially since there's nothing in /etc/modprobe.conf -# except for comments explaining not to use it. -zcat $CWD/modprobe.quit.whining.about.modprobe.conf.diff.gz | patch -p1 || exit 1 - # Using --bindir=/sbin to make lsmod go there too CFLAGS= \ ./configure \ @@ -106,6 +101,7 @@ if [ -r ChangeLog ]; then fi mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG |