SOURCES: module-init-tools-insmod-zlib.patch, module-init-tools-modprobe_d....
arekm
arekm at pld-linux.org
Sun Apr 12 08:55:09 CEST 2009
Author: arekm Date: Sun Apr 12 06:55:09 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
module-init-tools-insmod-zlib.patch (1.6 -> 1.7) , module-init-tools-modprobe_d.patch (1.4 -> 1.5) , module-init-tools-shared-zlib.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/module-init-tools-insmod-zlib.patch
diff -u SOURCES/module-init-tools-insmod-zlib.patch:1.6 SOURCES/module-init-tools-insmod-zlib.patch:1.7
--- SOURCES/module-init-tools-insmod-zlib.patch:1.6 Sun Nov 2 23:53:51 2008
+++ SOURCES/module-init-tools-insmod-zlib.patch Sun Apr 12 08:55:02 2009
@@ -5,9 +5,9 @@
#include <asm/unistd.h>
+#include "zlibsupport.h"
- #include "backwards_compat.c"
+ #include "util.h"
+ #include "testing.h"
- #define streq(a,b) (strcmp((a),(b)) == 0)
@@ -57,48 +58,6 @@
}
}
@@ -60,12 +60,14 @@
diff -urN module-init-tools-3.0.org/Makefile.am module-init-tools-3.0/Makefile.am
--- module-init-tools-3.0.org/Makefile.am 2004-07-17 19:56:16.090395360 +0200
+++ module-init-tools-3.0/Makefile.am 2004-07-17 20:05:45.953762960 +0200
-@@ -1,4 +1,4 @@
--insmod_SOURCES = insmod.c testing.h
-+insmod_SOURCES = insmod.c testing.h zlibsupport.c zlibsupport.h
- lsmod_SOURCES = lsmod.c testing.h
- modprobe_SOURCES = modprobe.c logging.c index.c zlibsupport.c logging.h index.h testing.h zlibsupport.h
- rmmod_SOURCES = rmmod.c testing.h
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+-insmod_SOURCES = insmod.c util.c logging.c util.h logging.h testing.h
++insmod_SOURCES = insmod.c util.c logging.c util.h logging.h testing.h zlibsupport.c zlibsupport.h
+ lsmod_SOURCES = lsmod.c util.c logging.c util.h logging.h testing.h
+ modprobe_SOURCES = modprobe.c util.c logging.c index.c zlibsupport.c config_filter.c util.h logging.h index.h testing.h zlibsupport.h config_filter.h
+ rmmod_SOURCES = rmmod.c util.c logging.c util.h logging.h testing.h
@@ -6,10 +6,8 @@
modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
modindex_SOURCES = modindex.c logging.c index.c logging.h index.h
================================================================
Index: SOURCES/module-init-tools-modprobe_d.patch
diff -u SOURCES/module-init-tools-modprobe_d.patch:1.4 SOURCES/module-init-tools-modprobe_d.patch:1.5
--- SOURCES/module-init-tools-modprobe_d.patch:1.4 Sun Nov 2 23:53:52 2008
+++ SOURCES/module-init-tools-modprobe_d.patch Sun Apr 12 08:55:03 2009
@@ -1,56 +1,35 @@
diff -Nur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2.modprobe_d/modprobe.c
--- module-init-tools-3.2.2/modprobe.c 2005-12-02 00:42:09.000000000 +0100
+++ module-init-tools-3.2.2.modprobe_d/modprobe.c 2006-01-21 03:11:18.000000000 +0100
-@@ -1185,7 +1185,8 @@
- if (dir) {
- struct dirent *i;
- while ((i = readdir(dir)) != NULL) {
-- if (!streq(i->d_name,".") && !streq(i->d_name,"..")) {
-+ if (strlen(i->d_name) > 5 &&
-+ strcmp(i->d_name + strlen(i->d_name) - 5, ".conf") == 0) {
- char sub[strlen(filename) + 1
- + strlen(i->d_name) + 1];
-
-@@ -1209,11 +1210,13 @@
- return ret;
- }
-
-+#define MODPROBE_D_CONF "/etc/modprobe.d"
- static const char *default_configs[] =
- {
-+ MODPROBE_D_CONF,
- "/etc/modprobe.conf",
-- "/etc/modprobe.d",
+@@ -59,6 +59,8 @@
+ char filename[0];
};
-+char *modprobe_d_ver = NULL;
- static void read_toplevel_config(const char *filename,
- const char *name,
-@@ -1367,6 +1367,10 @@
- }
-
- /* Try defaults. */
-+ if ( modprobe_d_ver != NULL )
-+ read_config(modprobe_d_ver, name, dump_only, removing,
-+ options, commands, aliases, blacklist);
-+
- for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
- read_config(default_configs[i], name, dump_only, removing,
- options, commands, aliases, blacklist);
-@@ -1547,6 +1552,10 @@
- + sizeof("/modules.symbols")));
- sprintf(symfilename, "%s/modules.symbols", dirname);
-
-+ modprobe_d_ver = NOFAIL(malloc(strlen(buf.release)
-+ + sizeof(MODPROBE_D_CONF) + 1));
-+ sprintf(modprobe_d_ver, "%s/%s", MODPROBE_D_CONF, buf.release);
++char *modprobe_d_ver = NULL;
+
- /* Old-style -t xxx wildcard? Only with -l. */
- if (list_only) {
- if (optind+1 < argc)
-@@ -1660,3 +1669,5 @@
+ #ifndef MODULE_DIR
+ #define MODULE_DIR "/lib/modules"
+ #endif
+@@ -1245,9 +1247,7 @@
+ if (len < 6 ||
+ (strcmp(&i->d_name[len-5], ".conf") != 0 &&
+ strcmp(&i->d_name[len-6], ".alias") != 0))
+- warn("All config files need .conf: %s/%s, "
+- "it will be ignored in a future release.\n",
+- filename, i->d_name);
++ continue;
+ fe = malloc(sizeof(struct file_entry) + len + 1);
+ if (fe == NULL)
+ continue;
+@@ -1308,6 +1308,11 @@
+ warn("Deprecated config file /etc/modprobe.conf, "
+ "all config files belong into /etc/modprobe.d/.\n");
- return 0;
- }
++ /* kernel ver based config */
++ if ( modprobe_d_ver != NULL )
++ parse_config_scan(modprobe_d_ver, name, dump_only, removing,
++ options, commands, aliases, blacklist);
+
-+// vim: ts=4
+ /* default config */
+ parse_config_scan("/etc/modprobe.d", name, dump_only, removing,
+ options, commands, aliases, blacklist);
================================================================
Index: SOURCES/module-init-tools-shared-zlib.patch
diff -u SOURCES/module-init-tools-shared-zlib.patch:1.7 SOURCES/module-init-tools-shared-zlib.patch:1.8
--- SOURCES/module-init-tools-shared-zlib.patch:1.7 Sun Aug 24 07:47:24 2008
+++ SOURCES/module-init-tools-shared-zlib.patch Sun Apr 12 08:55:03 2009
@@ -1,11 +1,6 @@
--- module-init-tools-3.0-pre9/configure.ac.orig 2004-01-30 05:15:25.000000000 +0100
+++ module-init-tools-3.0-pre9/configure.ac 2004-01-30 23:08:59.729518344 +0100
-@@ -6,19 +6,20 @@
-
- # If zlib is required, libz must be linked static, modprobe is in
- # /sbin, libz is in /usr/lib and may not be available when it is run.
-+# ...but in PLD libz is in /lib, so we can safely use shared zlib.
- AC_ARG_ENABLE(zlib,
+@@ -14,7 +14,7 @@
[ --enable-zlib Handle gzipped modules],
[if test "$enableval" = "yes"; then
AC_DEFINE(CONFIG_USE_ZLIB)
@@ -14,6 +9,7 @@
fi])
AC_PROG_CC
+@@ -27,8 +27,8 @@
# Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
# between a broken cc and a working cc but missing libz.a.
@@ -26,9 +22,9 @@
*-*-linux*) ;;
--- module-init-tools-0.9.14/Makefile.am.orig Tue Aug 26 04:13:18 2003
+++ module-init-tools-0.9.14/Makefile.am Mon Oct 13 10:59:14 2003
-@@ -8,6 +8,12 @@
- insmod_static_SOURCES = insmod.c
- insmod_static_LDFLAGS = -static
+@@ -13,6 +13,12 @@
+ # We don't want the $(zlib_flags) here: that makes a dynamic executable
+ insmod_static_LDADD =
+modprobe_LDADD = $(ZLIB)
+depmod_LDADD = $(ZLIB)
@@ -36,6 +32,6 @@
+insmod_LDADD = $(ZLIB)
+insmod_static_LDADD = $(ZLIB)
+
- EXTRA_insmod_SOURCES = backwards_compat.c
- EXTRA_lsmod_SOURCES = backwards_compat.c
- EXTRA_modprobe_SOURCES = backwards_compat.c
+ EXTRA_insmod_SOURCES =
+ EXTRA_lsmod_SOURCES =
+ EXTRA_modprobe_SOURCES =
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-insmod-zlib.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-modprobe_d.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-shared-zlib.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list