rpms/module-init-tools/FC-4 module-init-tools-allconf.patch, NONE, 1.1 module-init-tools-noescape.patch, NONE, 1.1 module-init-tools.spec, 1.12, 1.13 sources, 1.4, 1.5 module-init-tools-3.1-pre5.tar.bz2.sign, 1.1, NONE module-init-tools-badmodule.patch, 1.1, NONE module-init-tools-defconfig.patch, 1.3, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 2 15:25:21 UTC 2006
Author: harald
Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6209
Modified Files:
module-init-tools.spec sources
Added Files:
module-init-tools-allconf.patch
module-init-tools-noescape.patch
Removed Files:
module-init-tools-3.1-pre5.tar.bz2.sign
module-init-tools-badmodule.patch
module-init-tools-defconfig.patch
Log Message:
- FC4 version with fb modules blacklisted
module-init-tools-allconf.patch:
modprobe.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE module-init-tools-allconf.patch ---
--- 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 @@
static const char *default_configs[] =
{
- "/etc/modprobe.conf",
"/etc/modprobe.d",
+ "/etc/modprobe.conf",
};
static void read_toplevel_config(const char *filename,
@@ -1214,9 +1214,8 @@
/* Try defaults. */
for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
- if (read_config(default_configs[i], name, dump_only, removing,
- options, commands, aliases, blacklist))
- return;
+ read_config(default_configs[i], name, dump_only, removing,
+ options, commands, aliases, blacklist);
}
}
module-init-tools-noescape.patch:
depmod.c | 7 +------
1 files changed, 1 insertion(+), 6 deletions(-)
--- NEW FILE module-init-tools-noescape.patch ---
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 @@
else
afterslash++;
- /* Convert to underscores, stop at first . */
- for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
- if (afterslash[i] == '-')
- modname[i] = '_';
- else
+ for (i = 0; afterslash[i] && afterslash[i] != '.'; i++)
modname[i] = afterslash[i];
- }
modname[i] = '\0';
}
Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- module-init-tools.spec 22 Jul 2005 21:07:58 -0000 1.12
+++ module-init-tools.spec 2 Feb 2006 15:25:18 -0000 1.13
@@ -1,14 +1,16 @@
+%define preversion pre9
Summary: Kernel module management utilities.
Name: module-init-tools
-Version: 3.1
-Release: 4
+Version: 3.2
+Release: 0.%{preversion}.0.FC4.1
License: GPL
Group: System Environment/Kernel
-Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
-Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
+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
Source2: modprobe.conf.dist
-Patch1: module-init-tools-defconfig.patch
-Patch2: module-init-tools-badmodule.patch
+Source3: blacklist-compat
+Patch1: module-init-tools-allconf.patch
+Patch2: module-init-tools-noescape.patch
Exclusiveos: Linux
Prereq: /sbin/chkconfig sh-utils
Obsoletes: modules modutils-devel modutils
@@ -23,9 +25,9 @@
are two examples of loaded and unloaded modules.
%prep
-%setup -q -n module-init-tools-%{version}
+%setup -q -n module-init-tools-%{version}-%{preversion}
%patch1 -p1 -b .dist
-%patch2 -p1 -b .boom
+%patch2 -p0 -b .noescape
%build
export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -49,14 +51,20 @@
install -m 755 generate-modprobe.conf \
$RPM_BUILD_ROOT/sbin
+install -m 644 modprobe.conf.5 \
+ $RPM_BUILD_ROOT/%{_mandir}/man5/modprobe.d.5
+
mkdir -p $RPM_BUILD_ROOT/etc
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.conf.dist
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf.dist
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist-compat
find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static
+touch $RPM_BUILD_ROOT/etc/modprobe.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -78,14 +86,34 @@
%files
%defattr(-,root,root)
-/etc/modprobe.conf.dist
+/etc/modprobe.d
/sbin/*
%{_mandir}/*/*
+%ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
%changelog
-* Fri Jul 22 2005 Bill Nottingham <notting at redhat.com> 3.1-4
+* Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.1
+- FC4 version with fb modules blacklisted
+
+* Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.2
+- ghost /etc/modprobe.conf (#130603)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Sun Nov 06 2005 Florian La Roche <laroche at redhat.com>
+- update to 3.2pre9
+
+* Fri Sep 9 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.3
+- don't escape '-' in module names for module.alias
+
+* Fri Jul 22 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.2
- fix depmod segfault on bad modules (#162716)
+* Fri Jul 8 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.1
+- update to 3.2-pre7
+- put modprobe.conf.dist in /etc/modprobe.d
+
* Mon Apr 25 2005 Bill Nottingham <notting at redhat.com> 3.1-3
- load snd-seq-device/snd-seq-oss on load of pcm devices (part of #147637)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 7 Mar 2005 23:37:32 -0000 1.4
+++ sources 2 Feb 2006 15:25:18 -0000 1.5
@@ -1,2 +1,2 @@
-8ddecbcf0e56aef8617f67a3906faf3e module-init-tools-3.1.tar.bz2
-d352d8f0d981baae7990efc2f8659494 module-init-tools-3.1.tar.bz2.sign
+f0ede5936c52e3d59411bd9594ad364f module-init-tools-3.2-pre9.tar.bz2
+eb9afce36c140208a7245e1ae4337aeb module-init-tools-3.2-pre9.tar.bz2.sign
--- module-init-tools-3.1-pre5.tar.bz2.sign DELETED ---
--- module-init-tools-badmodule.patch DELETED ---
--- module-init-tools-defconfig.patch DELETED ---
More information about the fedora-cvs-commits
mailing list