rpms/module-init-tools/devel depmod.conf.dist, NONE, 1.1 module-init-tools-3.3-pre2.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.10, 1.11 module-init-tools-allconf.patch, 1.1, 1.2 module-init-tools-dump_modversions.patch, 1.1, 1.2 module-init-tools-noescape.patch, 1.1, 1.2 module-init-tools.spec, 1.41, 1.42 sources, 1.11, 1.12 upstream, 1.3, 1.4 module-init-tools-3.1-pre5.tar.bz2.sign, 1.1, NONE module-init-tools-3.3-pre1.tar.bz2.sign, 1.1, NONE module-init-tools-weak_updates.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Sep 30 14:20:56 UTC 2006 

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13921

Modified Files:
	.cvsignore module-init-tools-allconf.patch 
	module-init-tools-dump_modversions.patch 
	module-init-tools-noescape.patch module-init-tools.spec 
	sources upstream 
Added Files:
	depmod.conf.dist module-init-tools-3.3-pre2.tar.bz2.sign 
Removed Files:
	module-init-tools-3.1-pre5.tar.bz2.sign 
	module-init-tools-3.3-pre1.tar.bz2.sign 
	module-init-tools-weak_updates.patch 
Log Message:
Updated to new upstream release and incorporated default depmod config.



--- NEW FILE depmod.conf.dist ---
#
# depmod.conf
#

# override default search ordering for kmod packaging
search updates extra built-in weak-updates


--- NEW FILE module-init-tools-3.3-pre2.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBFHm+4eTyyexZHHxERAslKAKCDWt05U5ZcMvSRvOBmfFHFXVJR9wCeL+3s
8H2Ng1mznvGbbSL2LhcX8YE=
=Hl6U
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 May 2006 06:23:14 -0000	1.10
+++ .cvsignore	30 Sep 2006 14:20:54 -0000	1.11
@@ -1,2 +1 @@
-module-init-tools-3.3-pre1.tar.bz2
-module-init-tools-3.3-pre1.tar.bz2.sign
+module-init-tools-3.3-pre2.tar.bz2

module-init-tools-allconf.patch:
 depmod.c   |    8 +++-----
 modprobe.c |   10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

Index: module-init-tools-allconf.patch
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools-allconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module-init-tools-allconf.patch	8 Jul 2005 19:46:05 -0000	1.1
+++ module-init-tools-allconf.patch	30 Sep 2006 14:20:54 -0000	1.2
@@ -1,6 +1,33 @@
---- module-init-tools-3.2-pre7/modprobe.c.dist	2005-06-01 07:26:28.000000000 -0400
-+++ module-init-tools-3.2-pre7/modprobe.c	2005-07-08 15:30:55.000000000 -0400
-@@ -1189,8 +1189,8 @@
+diff -urN module-init-tools-3.3-pre2_orig/depmod.c module-init-tools-3.3-pre2_patched/depmod.c
+--- module-init-tools-3.3-pre2_orig/depmod.c	2006-09-30 02:13:22.000000000 +0100
++++ module-init-tools-3.3-pre2_patched/depmod.c	2006-09-30 14:17:36.000000000 +0100
+@@ -1024,8 +1024,8 @@
+ 
+ static const char *default_configs[] =
+ {
+-        "/etc/depmod.conf",
+         "/etc/depmod.d",
++        "/etc/depmod.conf",
+ };
+ 
+ static void read_toplevel_config(const char *filename,
+@@ -1043,10 +1043,8 @@
+         }
+ 
+         /* Try defaults. */
+-        for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
+-                if (read_config(default_configs[i], basedir, search, overrides))
+-                        return;
+-        }
++        for (i = 0; i < ARRAY_SIZE(default_configs); i++)
++                read_config(default_configs[i], basedir, search, overrides);
+ }
+ 
+ 
+diff -urN module-init-tools-3.3-pre2_orig/modprobe.c module-init-tools-3.3-pre2_patched/modprobe.c
+--- module-init-tools-3.3-pre2_orig/modprobe.c	2006-09-30 02:12:39.000000000 +0100
++++ module-init-tools-3.3-pre2_patched/modprobe.c	2006-09-30 14:16:47.000000000 +0100
+@@ -1225,8 +1225,8 @@
  
  static const char *default_configs[] = 
  {
@@ -10,15 +37,18 @@
  };
  
  static void read_toplevel_config(const char *filename,
-@@ -1214,9 +1214,8 @@
+@@ -1249,11 +1249,9 @@
+ 	}
  
  	/* Try defaults. */
- 	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
+-	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
 -		if (read_config(default_configs[i], name, dump_only, removing,
 -				options, commands, aliases, blacklist))
 -			return;
+-	}
++	for (i = 0; i < ARRAY_SIZE(default_configs); i++)
 +		read_config(default_configs[i], name, dump_only, removing,
 +			    options, commands, aliases, blacklist);
- 	}
  }
  
+ static void add_to_env_var(const char *option)

module-init-tools-dump_modversions.patch:
 modprobe.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+)

Index: module-init-tools-dump_modversions.patch
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools-dump_modversions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module-init-tools-dump_modversions.patch	14 Jun 2006 12:06:02 -0000	1.1
+++ module-init-tools-dump_modversions.patch	30 Sep 2006 14:20:54 -0000	1.2
@@ -1,5 +1,6 @@
---- module-init-tools-3.3-pre1/modprobe.c.dump	2006-06-14 12:14:03.000000000 +0200
-+++ module-init-tools-3.3-pre1/modprobe.c	2006-06-14 12:15:46.000000000 +0200
+diff -urN module-init-tools-3.3-pre2_orig/modprobe.c module-init-tools-3.3-pre2_patched/modprobe.c
+--- module-init-tools-3.3-pre2_orig/modprobe.c	2006-09-30 14:20:11.000000000 +0100
++++ module-init-tools-3.3-pre2_patched/modprobe.c	2006-09-30 14:20:56.000000000 +0100
 @@ -976,6 +976,67 @@
  	goto remove_rest;
  }
@@ -68,7 +69,7 @@
  /* Does path contain directory(s) subpath? */
  static int type_matches(const char *path, const char *subpath)
  {
-@@ -1384,6 +1445,7 @@
+@@ -1383,6 +1444,7 @@
  				   { "set-version", 1, NULL, 'S' },
  				   { "show-depends", 0, NULL, 'D' },
  				   { "first-time", 0, NULL, 3 },
@@ -76,7 +77,7 @@
  				   { "use-blacklist", 0, NULL, 'b' },
  				   { NULL, 0, NULL, 0 } };
  
-@@ -1421,6 +1483,7 @@
+@@ -1420,6 +1482,7 @@
  	int strip_modversion = 0;
  	int ignore_proc = 0;
  	int first_time = 0;
@@ -84,7 +85,7 @@
  	int use_blacklist = 0;
  	unsigned int i, num_modules;
  	char *type = NULL;
-@@ -1537,6 +1600,9 @@
+@@ -1536,6 +1599,9 @@
  		case 3:
  			first_time = 1;
  			break;
@@ -94,7 +95,7 @@
  		default:
  			print_usage(argv[0]);
  		}
-@@ -1602,6 +1668,11 @@
+@@ -1601,6 +1667,11 @@
  		LIST_HEAD(list);
  		char *modulearg = argv[optind + i];
  

module-init-tools-noescape.patch:
 depmod.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

Index: module-init-tools-noescape.patch
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools-noescape.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module-init-tools-noescape.patch	9 Sep 2005 04:30:47 -0000	1.1
+++ module-init-tools-noescape.patch	30 Sep 2006 14:20:54 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ru depmod.c.old depmod.c
---- depmod.c	2005-04-30 08:38:46.000000000 -0400
-+++ depmod.c	2005-09-08 15:52:26.000000000 -0400
-@@ -607,13 +607,8 @@
+diff -urN module-init-tools-3.3-pre2_orig/depmod.c module-init-tools-3.3-pre2_patched/depmod.c
+--- module-init-tools-3.3-pre2_orig/depmod.c	2006-09-30 14:20:11.000000000 +0100
++++ module-init-tools-3.3-pre2_patched/depmod.c	2006-09-30 14:19:19.000000000 +0100
+@@ -695,13 +695,8 @@
  	else
  		afterslash++;
  


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- module-init-tools.spec	3 Aug 2006 00:19:24 -0000	1.41
+++ module-init-tools.spec	30 Sep 2006 14:20:54 -0000	1.42
@@ -1,19 +1,19 @@
-%define preversion -pre1
+%define preversion -pre2
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.17
+Release: 0.pre2.1.0
 License: GPL
 Group: System Environment/Kernel
-Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
-Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign
+Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
+Source1: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign
 Source2: modprobe.conf.dist
 Source3: blacklist-compat
 Source4: weak-modules
+Source5: depmod.conf.dist
 Patch1: module-init-tools-allconf.patch
 Patch2: module-init-tools-noescape.patch
-Patch3: module-init-tools-weak_updates.patch
-Patch4: module-init-tools-dump_modversions.patch
+Patch3: module-init-tools-dump_modversions.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -31,8 +31,7 @@
 %setup -q -n module-init-tools-%{version}%{preversion}
 %patch1 -p1 -b .dist
 %patch2 -p0 -b .noescape
-%patch3 -p1 -b .weak
-%patch4 -p1 -b .dump
+%patch3 -p1 -b .dump
 
 %build
 export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -65,6 +64,9 @@
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist-compat
 install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/sbin/weak-modules
 
+mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/depmod.d/depmod.conf.dist
+
 find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
 
 mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
@@ -93,11 +95,15 @@
 %files
 %defattr(-,root,root)
 /etc/modprobe.d
+/etc/depmod.d
 /sbin/*
 %{_mandir}/*/*
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Sat Sep 23 2006 Jon Masters <jcm at redhat.com> - 3.3-0,pre2.1.0
+- Updated to upstream with new module priority/override features.
+
 * Thu Aug  3 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.17
 - Build in a shell version of rpmsort to avoid unnecessary dep.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 May 2006 06:25:01 -0000	1.11
+++ sources	30 Sep 2006 14:20:54 -0000	1.12
@@ -1 +1 @@
-d27445bc9b6d3fce34993fcbc86cf0ea  module-init-tools-3.3-pre1.tar.bz2
+32a443e6d1d4e22bc3695a28ab8668e7  module-init-tools-3.3-pre2.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream	10 May 2006 06:29:43 -0000	1.3
+++ upstream	30 Sep 2006 14:20:54 -0000	1.4
@@ -1 +1 @@
-module-init-tools-3.3-pre1.tar.bz2
+module-init-tools-3.3-pre2.tar.bz2


--- module-init-tools-3.1-pre5.tar.bz2.sign DELETED ---


--- module-init-tools-3.3-pre1.tar.bz2.sign DELETED ---


--- module-init-tools-weak_updates.patch DELETED ---

More information about the fedora-cvs-commits mailing list