Hello community,
here is the log from the commit of package module-init-tools for openSUSE:Factory
checked in at Wed Jun 2 18:14:43 CEST 2010.
--------
--- module-init-tools/module-init-tools.changes 2009-11-04 21:20:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2010-06-02 10:40:58.000000000 +0200
@@ -1,0 +2,30 @@
+Wed Jun 2 09:51:36 CEST 2010 - mmarek@suse.cz
+
+- doc: Do not generate modprobe.d.5 from sgml
+- commit a27b05e
+
+-------------------------------------------------------------------
+Tue Jun 1 17:08:23 CEST 2010 - mmarek@suse.cz
+
+- Fix a build error in modprobe.c
+- commit 2253e3d
+
+-------------------------------------------------------------------
+Tue Jun 1 17:08:00 CEST 2010 - mmarek@suse.cz
+
+- One more specfile fix
+- commit 555c740
+
+-------------------------------------------------------------------
+Tue Jun 1 16:33:18 CEST 2010 - mmarek@suse.cz
+
+- Fix specfile template for -rcX versions
+- commit b65fbf9
+
+-------------------------------------------------------------------
+Tue Jun 1 16:22:09 CEST 2010 - mmarek@suse.cz
+
+- Update to current git (v3.12-pre3+)
+- commit 8c596ff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
module-init-tools-3.11.1.tar.bz2
New:
----
module-init-tools-3.12-pre3.tar.bz2
module-init-tools-upstream.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.7iEQGT/_old 2010-06-02 18:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.7iEQGT/_new 2010-06-02 18:14:07.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package module-init-tools (Version 3.11.1)
+# spec file for package module-init-tools (Version 3.12)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
Name: module-init-tools
BuildRequires: zlib-devel
-Version: 3.11.1
-Release: 2
-License: GPL v2 or later
+Version: 3.12
+Release: 1
+License: GPLv2+
Group: System/Kernel
# for grepping /etc/SUSE-release
PreReq: grep
@@ -38,14 +38,14 @@
AutoReqProv: on
Summary: Utilities to Load Modules into the Kernel
Url: http://www.kerneltools.org/
-Source0: http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-i...
+Source0: http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-i...
Source1: README.SUSE
Source2: modprobe.conf.tar.bz2
Source3: depmod-00-system.conf
Source4: 10-unsupported-modules.conf
Source5: weak-modules
Source6: weak-modules2
-# Patch1: module-init-tools-upstream.diff
+Patch1: module-init-tools-upstream.diff
Patch2: module-init-tools-suse.diff
Patch3: module-init-tools-manpages.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,10 +67,11 @@
Jon Masters
%prep
-%setup -q -a2
-# patch1 -p1
+%setup -q -n module-init-tools-3.12-pre3 -a2
+%patch1 -p1
%patch2 -p1
%patch3 -p1
+rm doc/modprobe.d.sgml
%build
autoreconf --force --install
++++++ module-init-tools-manpages.diff ++++++
--- /var/tmp/diff_new_pack.7iEQGT/_old 2010-06-02 18:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.7iEQGT/_new 2010-06-02 18:14:07.000000000 +0200
@@ -3,20 +3,20 @@
--- a/modprobe.8
+++ b/modprobe.8
@@ -1,18 +1,28 @@
--.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
--.TH "MODPROBE" "8" "2002-12-27" "" ""
+-.\\" auto-generated by docbook2man-spec $Revision: 1.2 $
+-.TH "MODPROBE" "8" "2010-03-01" "" ""
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
-+.TH "MODPROBE" "8" "04 November 2009" "" ""
++.TH "MODPROBE" "8" "02 June 2010" "" ""
+
.SH NAME
modprobe \- program to add and remove modules from the Linux Kernel
.SH SYNOPSIS
-.sp
--\fBmodprobe\fR [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-C \fIconfig-file\fB\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB-q\fR ] [ \fB-b\fR ] [ \fB-o \fImodulename\fB\fR ] [ \fB\fImodulename\fB\fR ] [ \fB\fImodule parameters\fB\fR\fI...\fR ]
+-\fBmodprobe\fR [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-C \fIconfig-file\fB\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB-q\fR ] [ \fB-b\fR ] [ \fB\fImodulename\fB\fR ] [ \fB\fImodule parameters\fB\fR\fI...\fR ]
-.sp
-\fBmodprobe\fR [ \fB-r\fR ] [ \fB-v\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB\fImodulename\fB\fR\fI...\fR ]
-.sp
@@ -24,9 +24,9 @@
-.sp
-\fBmodprobe\fR [ \fB-c\fR ]
-.sp
--\fBmodprobe\fR [ \fB--dump-modversions\fR ] [ \fB\fIfilename\fB\fR\fI...\fR ]
+-\fBmodprobe\fR [ \fB--dump-modversions\fR ] [ \fB\fIfilename\fB\fR ]
+
-+\fBmodprobe\fR [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-C \fIconfig-file\fB\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB-q\fR ] [ \fB-b\fR ] [ \fB-o \fImodulename\fB\fR ] [ \fB\fImodulename\fB\fR ] [ \fB\fImodule parameters\fB\fR\fI ...\fR ]
++\fBmodprobe\fR [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-C \fIconfig-file\fB\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB-q\fR ] [ \fB-b\fR ] [ \fB\fImodulename\fB\fR ] [ \fB\fImodule parameters\fB\fR\fI ...\fR ]
+
+
+\fBmodprobe\fR [ \fB-r\fR ] [ \fB-v\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB\fImodulename\fB\fR\fI ...\fR ]
@@ -38,126 +38,81 @@
+\fBmodprobe\fR [ \fB-c\fR ]
+
+
-+\fBmodprobe\fR [ \fB--dump-modversions\fR ] [ \fB\fIfilename\fB\fR\fI ...\fR ]
++\fBmodprobe\fR [ \fB--dump-modversions\fR ] [ \fB\fIfilename\fB\fR ]
+
.SH "DESCRIPTION"
.PP
\fBmodprobe\fR intelligently adds or removes a
-@@ -25,19 +35,19 @@
- \fI/etc/modprobe.d\fR directory
- (see \fBmodprobe.conf\fR(5)). \fBmodprobe\fR will also use module
- options specified on the kernel command line in the form of
--<module>.<option>.
-+<module>\&.<option>\&.
- .PP
- Note that this version of \fBmodprobe\fR does not
+@@ -31,7 +41,7 @@
+ Note that unlike in 2.4 series Linux kernels (which are not supported
+ by this tool) this version of \fBmodprobe\fR does not
do anything to the module itself: the work of resolving symbols
-and understanding parameters is done inside the kernel. So
+and understanding parameters is done inside the kernel. So
module failure is sometimes accompanied by a kernel message: see
--\fBdmesg\fR(8).
-+\fBdmesg\fR(8)\&.
+ \fBdmesg\fR(8)\&.
.PP
- \fBmodprobe\fR expects an up-to-date
- \fImodules.dep\fR file, as generated by
--\fBdepmod\fR (see \fBdepmod\fR(8)). This file lists what other modules each
-+\fBdepmod\fR (see \fBdepmod\fR(8)). This file lists what other modules each
+@@ -40,7 +50,7 @@
+ readable \fImodules.dep\fR file), as generated
+ by the corresponding \fBdepmod\fR utility shipped
+ along with \fBmodprobe\fR (see
+-\fBdepmod\fR(8)). This file lists what other modules each
++\fBdepmod\fR(8)). This file lists what other modules each
module needs (if any), and \fBmodprobe\fR uses this
--to add or remove these dependencies automatically. See
-+to add or remove these dependencies automatically. See
- \fBmodules.dep\fR(5)).
+ to add or remove these dependencies automatically.
.PP
- If any arguments are given after the
-@@ -46,8 +56,8 @@
+@@ -50,16 +60,16 @@
file).
.SH "OPTIONS"
.TP
--\fB-v --verbose\fR
--Print messages about what the program is doing. Usually
-+\fB-v --verbose \fR
-+Print messages about what the program is doing. Usually
- \fBmodprobe\fR only prints messages if
- something goes wrong.
-
-@@ -56,7 +66,7 @@
- \fBmodprobe\fR commands in the
- MODPROBE_OPTIONS environment variable.
+-\fB-a --all\fR
++\fB-a --all \fR
+ Insert all module names on the command line.
+ .TP
+-\fB-b --use-blacklist\fR
++\fB-b --use-blacklist \fR
+ This option causes \fBmodprobe\fR to apply the
+ \fBblacklist\fR commands in the configuration files
+-(if any) to module names as well. It is usually used by
++(if any) to module names as well. It is usually used by
+ \fBudev\fR(7)\&.
.TP
-\fB-C --config\fR
+\fB-C --config \fR
This option overrides the default configuration directory/file
(\fI/etc/modprobe.d\fR or
\fI/etc/modprobe.conf\fR).
-@@ -66,106 +76,106 @@
+@@ -69,67 +79,67 @@
\fBmodprobe\fR commands in the
MODPROBE_OPTIONS environment variable.
.TP
-\fB-c --showconfig\fR
+\fB-c --showconfig \fR
- Dump out the effective configuration from the config directory and exit.
- .TP
--\fB-n --dry-run\fR
-+\fB-n --dry-run --show \fR
- This option does everything but actually insert or
- delete the modules (or run the install or remove
--commands). Combined with \fB-v\fR, it is
-+commands). Combined with \fB-v\fR, it is
- useful for debugging problems.
- .TP
--\fB-i --ignore-install --ignore-remove\fR
-+\fB-i --ignore-install --ignore-remove \fR
- This option causes \fBmodprobe\fR to
- ignore \fBinstall\fR and
- \fBremove\fR commands in the
- configuration file (if any) for the module specified on the
- command line (any dependent modules are still subject
- to commands set for them in the configuration file).
--See \fBmodprobe.conf\fR(5).
-+See \fBmodprobe.conf\fR(5)\&.
+ Dump out the effective configuration from the config directory
+ and exit.
.TP
--\fB-q --quiet\fR
-+\fB-q --quiet \fR
- Normally \fBmodprobe\fR will report an error
- if you try to remove or insert a module it can't find (and
- isn't an alias or
- \fBinstall\fR/\fBremove\fR
--command). With this flag, \fBmodprobe\fR
-+command). With this flag, \fBmodprobe\fR
- will simply ignore any bogus names (the kernel uses this
- to opportunistically probe for modules which might exist).
- .TP
--\fB-r --remove\fR
-+\fB-r --remove \fR
- This option causes \fBmodprobe\fR to remove
--rather than insert a module. If the modules it depends on
-+rather than insert a module. If the modules it depends on
- are also unused, \fBmodprobe\fR will try to
--remove them too. Unlike insertion, more than one module
-+remove them too. Unlike insertion, more than one module
- can be specified on the command line (it does not make
- sense to specify module parameters when removing modules).
-
- There is usually no reason to remove modules, but some
--buggy modules require it. Your kernel may not support
-+buggy modules require it. Your kernel may not support
- removal of modules.
+-\fB--dump-modversions\fR
++\fB--dump-modversions \fR
+ Print out a list of module versioning information required by a
+ module. This option is commonly used by distributions in order to
+ package up a Linux kernel module using module versioning deps.
.TP
--\fB-V --version\fR
-+\fB-V --version \fR
- Show version of program and exit.
+-\fB-d --dirname\fR
++\fB-d --dirname \fR
+ Directory where modules can be found,
+ \fI/lib/modules/RELEASE\fR
+ by default.
.TP
--\fB-f --force\fR
-+\fB-f --force \fR
- Try to strip any versioning information from the module
- which might otherwise stop it from loading: this is the
- same as using both \fB--force-vermagic\fR and
--\fB--force-modversion\fR. Naturally, these
-+\fB--force-modversion\fR\&. Naturally, these
- checks are there for your protection, so using this option
- is dangerous.
-
- This applies to any modules inserted: both the module (or
- alias) on the command line and any modules it on which it depends.
+-\fB--first-time\fR
++\fB--first-time \fR
+ Normally, \fBmodprobe\fR will succeed (and do
+ nothing) if told to insert a module which is already
+-present or to remove a module which isn't present. This is
++present or to remove a module which isn't present. This is
+ ideal for simple scripts; however, more complicated scripts often
+ want to know whether \fBmodprobe\fR really
+ did something: this option makes modprobe fail in the
+ case that it actually didn't do anything.
.TP
-\fB--force-vermagic\fR
+\fB--force-vermagic \fR
@@ -168,7 +123,8 @@
"version magic" doesn't match, you can use this option to
-remove it. Naturally, this check is there for your
+remove it. Naturally, this check is there for your
- protection, so this using option is dangerous.
+ protection, so this using option is dangerous unless
+ you know what you're doing.
This applies to any modules inserted: both the module (or
alias) on the command line and any modules on which it depends.
@@ -184,47 +140,82 @@
can use "--force-modversion" to remove the version
-information altogether. Naturally, this check is there
+information altogether. Naturally, this check is there
- for your protection, so using this option is dangerous.
+ for your protection, so using this option is dangerous
+ unless you know what you're doing.
This applies any modules inserted: both the module (or
alias) on the command line and any modules on which it depends.
.TP
+-\fB-f --force\fR
++\fB-f --force \fR
+ Try to strip any versioning information from the module
+ which might otherwise stop it from loading: this is the
+ same as using both \fB--force-vermagic\fR and
+-\fB--force-modversion\fR\&. Naturally, these
++\fB--force-modversion\fR\&. Naturally, these
+ checks are there for your protection, so using this option
+ is dangerous unless you know what you are doing.
+
+ This applies to any modules inserted: both the module (or
+ alias) on the command line and any modules it on which it depends.
+ .TP
+-\fB-i --ignore-install --ignore-remove\fR
++\fB-i --ignore-install --ignore-remove \fR
+ This option causes \fBmodprobe\fR to
+ ignore \fBinstall\fR and
+ \fBremove\fR commands in the
+@@ -144,22 +154,22 @@
+ \fB--ignore-remove\fR\&.
+ See \fBmodprobe.conf\fR(5)\&.
+ .TP
-\fB-l --list\fR
+\fB-l --list \fR
List all modules matching the given wildcard (or "*"
-if no wildcard is given). This option is provided for
+if no wildcard is given). This option is provided for
- backwards compatibility: see
+ backwards compatibility and may go away in future: see
\fBfind\fR(1) and
\fBbasename\fR(1) for a more flexible alternative.
.TP
--\fB-a --all\fR
-+\fB-a --all \fR
- Insert all module names on the command line.
+-\fB-n --dry-run\fR
++\fB-n --dry-run --show \fR
+ This option does everything but actually insert or
+ delete the modules (or run the install or remove
+-commands). Combined with \fB-v\fR, it is
++commands). Combined with \fB-v\fR, it is
+ useful for debugging problems. For historical reasons
+ both \fB--dry-run\fR and \fB--show\fR
+ actually mean the same thing and are interchangeable.
.TP
--\fB-t --type\fR
-+\fB-t --type \fR
- Restrict \fB-l\fR to modules
- in directories matching the
--\fIdirname\fR given. This option
-+\fIdirname\fR given. This option
- is provided for backwards compatibility: see
- \fBfind\fR(1)
- and
- \fBbasename\fR(1) for a more flexible alternative.
+-\fB-q --quiet\fR
++\fB-q --quiet \fR
+ With this flag, \fBmodprobe\fR won't print an error
+ message if you try to remove or insert a module it can't find (and
+ isn't an alias or
+@@ -168,43 +178,43 @@
+ kernel uses this to opportunistically probe for modules which might
+ exist using request_module.
+ .TP
+-\fB-R --resolve-alias\fR
++\fB-R --resolve-alias \fR
+ Print all module names matching an alias. This can be useful
+ for debugging module alias problems.
.TP
--\fB-s --syslog\fR
-+\fB-s --syslog \fR
- This option causes any error messages to go through the
- syslog mechanism (as LOG_DAEMON with level LOG_NOTICE)
--rather than to standard error. This is also automatically
-+rather than to standard error. This is also automatically
- enabled when stderr is unavailable.
+-\fB-r --remove\fR
++\fB-r --remove \fR
+ This option causes \fBmodprobe\fR to remove
+-rather than insert a module. If the modules it depends on
++rather than insert a module. If the modules it depends on
+ are also unused, \fBmodprobe\fR will try to
+-remove them too. Unlike insertion, more than one module
++remove them too. Unlike insertion, more than one module
+ can be specified on the command line (it does not make
+ sense to specify module parameters when removing modules).
- This option is passed through \fBinstall\fR
-@@ -173,59 +183,68 @@
- \fBmodprobe\fR commands in the
- MODPROBE_OPTIONS environment variable.
+ There is usually no reason to remove modules, but some
+-buggy modules require it. Your distribution kernel may not
++buggy modules require it. Your distribution kernel may not
+ have been built to support removal of modules at all.
.TP
-\fB-S --set-version\fR
+\fB-S --set-version \fR
@@ -238,58 +229,55 @@
-the module itself. This produces a (possibly empty) set
+the module itself. This produces a (possibly empty) set
of module filenames, one per line, each starting with
--"insmod". Install commands which apply are shown prefixed by
+ "insmod" and is typically used by distributions to determine
+ which modules to include when generating initrd/initramfs images.
+ \fBInstall\fR commands which apply are shown prefixed by
-"install". It does not run any of the install commands. Note that
-+"insmod". Install commands which apply are shown prefixed by
+"install". It does not run any of the install commands. Note that
\fBmodinfo\fR(8)
can be used to extract dependencies of a module from the
module itself, but knows nothing of aliases or install commands.
.TP
--\fB--resolve-alias\fR
-+\fB--resolve-alias \fR
- Print all module names matching an alias.
- .TP
--\fB-o --name\fR
-+\fB-o --name \fR
- This option tries to rename the module which is being
--inserted into the kernel. Some testing modules can
-+inserted into the kernel. Some testing modules can
- usefully be inserted multiple times, but the kernel
--refuses to have two modules of the same name. Normally,
-+refuses to have two modules of the same name. Normally,
- modules should not require multiple insertions, as that
- would make them useless if there were no module support.
- .TP
--\fB--first-time\fR
-+\fB--first-time \fR
- Normally, \fBmodprobe\fR will succeed (and do
- nothing) if told to insert a module which is already
--present or to remove a module which isn't present. This is
-+present or to remove a module which isn't present. This is
- ideal for
- simple scripts; however, more complicated scripts often
- want to know whether \fBmodprobe\fR really
- did something: this option makes modprobe fail for that
- case.
+-\fB-s --syslog\fR
++\fB-s --syslog \fR
+ This option causes any error messages to go through the
+ syslog mechanism (as LOG_DAEMON with level LOG_NOTICE)
+-rather than to standard error. This is also automatically
++rather than to standard error. This is also automatically
+ enabled when stderr is unavailable.
+
+ This option is passed through \fBinstall\fR
+@@ -212,21 +222,21 @@
+ \fBmodprobe\fR commands in the
+ MODPROBE_OPTIONS environment variable.
.TP
--\fB--dump-modversions\fR
-+\fB--dump-modversions \fR
- Print out a list of module versioning information required by a
- module. This option is commonly used by distributions in order to
- package up a Linux kernel module using module versioning deps.
+-\fB-t --type\fR
++\fB-t --type \fR
+ Restrict \fB-l\fR to modules
+ in directories matching the
+-\fIdirname\fR given. This option
++\fIdirname\fR given. This option
+ is provided for backwards compatibility and may go
+ away in future: see
+ \fBfind\fR(1)
+ and
+ \fBbasename\fR(1) for a more flexible alternative.
.TP
--\fB-b --use-blacklist\fR
-+\fB-b --use-blacklist \fR
- This option causes \fBmodprobe\fR to apply the
- \fBblacklist\fR commands in the configuration files (if
--any) to module names as well. It is usually used by \fBudev\fR(7).
-+any) to module names as well. It is usually used by \fBudev\fR(7)\&.
+-\fB-V --version\fR
++\fB-V --version \fR
+ Show version of program and exit.
.TP
--\fB-d --dirname\fR
-+\fB-d --dirname \fR
- Directory where modules can be found, \fI/lib/modules/RELEASE\fR
- by default.
+-\fB-v --verbose\fR
+-Print messages about what the program is doing. Usually
++\fB-v --verbose \fR
++Print messages about what the program is doing. Usually
+ \fBmodprobe\fR only prints messages if
+ something goes wrong.
+
+@@ -234,6 +244,15 @@
+ or \fBremove\fR commands to other
+ \fBmodprobe\fR commands in the
+ MODPROBE_OPTIONS environment variable.
+.TP
+\fB--allow-unsupported-modules \fR
+Load unsupported modules even if disabled in configuration.
@@ -302,29 +290,24 @@
.SH "ENVIRONMENT"
.PP
The MODPROBE_OPTIONS environment variable can also be used to
--pass arguments to \fBmodprobe\fR.
-+pass arguments to \fBmodprobe\fR\&.
- .SH "COPYRIGHT"
- .PP
- This manual page Copyright 2002, Rusty Russell, IBM Corporation.
--- a/modprobe.conf.5
+++ b/modprobe.conf.5
@@ -1,5 +1,10 @@
--.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
--.TH "MODPROBE.CONF" "5" "2005-06-01" "" ""
+-.\\" auto-generated by docbook2man-spec $Revision: 1.2 $
+-.TH "MODPROBE.CONF" "5" "2010-03-09" "" ""
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
-+.TH "MODPROBE.CONF" "5" "04 November 2009" "" ""
++.TH "MODPROBE.CONF" "5" "02 June 2010" "" ""
+
.SH NAME
modprobe.d, modprobe.conf \- Configuration directory/file for modprobe
.SH "DESCRIPTION"
@@ -7,12 +12,12 @@
Because the \fBmodprobe\fR command can add or
- remove more than one module, due to module dependencies,
+ remove more than one module, due to modules having dependencies,
we need a method of specifying what options are to be used with
-those modules. All files underneath the
+those modules. All files underneath the
@@ -337,7 +320,7 @@
alternate names for a module, or they can override the normal
\fBmodprobe\fR behavior altogether for those with
special requirements (such as inserting more than one module).
-@@ -24,30 +29,30 @@
+@@ -24,50 +29,50 @@
The format of and files under \fImodprobe.d\fR and
\fI/etc/modprobe.conf\fR is simple: one
command per line, with blank lines and lines starting with '#'
@@ -363,31 +346,32 @@
will be added to any other options.
Note that modules can also contain their own aliases,
--which you can see using \fBmodinfo\fR. These
+-which you can see using \fBmodinfo\fR\&. These
+which you can see using \fBmodinfo\fR\&. These
aliases are used as a last resort (ie. if there is no real
module, \fBinstall\fR,
\fBremove\fR, or \fBalias\fR
command in the configuration).
.TP
--\fBoptions \fImodulename\fB \fIoption...\fB\fR
-+\fBoptions \fImodulename\fB \fIoption...\fB \fR
- This command allows you to add options to the module
- \fImodulename\fR (which might be an
- alias) every time it is inserted into the kernel: whether
-@@ -59,24 +64,24 @@
- \fBoption\fR for the module itself, for an
- alias, and on the command line.
+-\fBblacklist \fImodulename\fB\fR
++\fBblacklist \fImodulename\fB \fR
+ Modules can contain their own aliases: usually these are
+ aliases describing the devices they support, such as
+-"pci:123...". These "internal" aliases can be overridden
++"pci:123...". These "internal" aliases can be overridden
+ by normal "alias" keywords, but there are cases where two
+ or more modules both support the same devices, or a module
+ invalidly claims to support a device that it does not: the
+ \fBblacklist\fR keyword indicates that all of
+ that particular module's internal aliases are to be ignored.
.TP
-\fBinstall \fImodulename\fB \fIcommand...\fB\fR
+\fBinstall \fImodulename\fB \fIcommand...\fB \fR
- This is the most powerful primitive: it tells
- \fBmodprobe\fR to run your command instead of
--inserting the module in the kernel as normal. The command
-+inserting the module in the kernel as normal. The command
- can be any shell command: this allows you to do any kind
--of complex processing you might wish. For example, if the
-+of complex processing you might wish. For example, if the
+ This command instructs \fBmodprobe\fR to run your
+ command instead of inserting the module in the kernel as normal.
+ The command can be any shell command: this allows you to do any
+-kind of complex processing you might wish. For example, if the
++kind of complex processing you might wish. For example, if the
module "fred" works better with the module "barney"
already installed (but it doesn't depend on it, so
\fBmodprobe\fR won't automatically load it),
@@ -398,14 +382,7 @@
which stops the second \fBmodprobe\fR from
running the same \fBinstall\fR command again.
See also \fBremove\fR below.
-
- You can also use \fBinstall\fR to make up
--modules which don't otherwise exist. For example:
-+modules which don't otherwise exist. For example:
- "install probe-ethernet /sbin/modprobe e100 ||
- /sbin/modprobe eepro100", which will first try to load the e100
- driver, and if it fails, then the eepro100 driver when you do "modprobe
-@@ -84,14 +89,14 @@
+@@ -86,14 +91,14 @@
If you use the string "$CMDLINE_OPTS" in the command, it
will be replaced by any options specified on the modprobe
@@ -418,26 +395,29 @@
fred /sbin/modprobe barney; /sbin/modprobe
--ignore-install fred $CMDLINE_OPTS"
.TP
+-\fBoptions \fImodulename\fB \fIoption...\fB\fR
++\fBoptions \fImodulename\fB \fIoption...\fB \fR
+ This command allows you to add options to the module
+ \fImodulename\fR (which might be an
+ alias) every time it is inserted into the kernel: whether
+@@ -105,11 +110,11 @@
+ \fBoption\fR for the module itself, for an
+ alias, and on the command line.
+ .TP
-\fBremove \fImodulename\fB \fIcommand...\fB\fR
+\fBremove \fImodulename\fB \fIcommand...\fB \fR
This is similar to the \fBinstall\fR command
above, except it is invoked when "modprobe -r" is run.
- The removal counterparts to the two examples above would
-@@ -99,15 +104,22 @@
- /sbin/modprobe -r barney", and "remove probe-ethernet
- /sbin/modprobe -r eepro100 || /sbin/modprobe -r e100".
.TP
--\fBblacklist \fImodulename\fB\fR
-+\fBblacklist \fImodulename\fB \fR
- Modules can contain their own aliases: usually these are
- aliases describing the devices they support, such as
--"pci:123...". These "internal" aliases can be overridden
-+"pci:123...". These "internal" aliases can be overridden
- by normal "alias" keywords, but there are cases where two
- or more modules both support the same devices, or a module
- invalidly claims to support a device: the
- \fBblacklist\fR keyword indicates that all of
- that particular module's internal aliases are to be ignored.
+-\fBsoftdep \fImodulename\fB pre: \fImodules...\fB post: \fImodules...\fB\fR
++\fBsoftdep \fImodulename\fB pre: \fImodules...\fB post: \fImodules...\fB \fR
+ The \fBsoftdep\fR command allows you to specify soft,
+ or optional, module dependencies. \fImodulename\fR
+ can be used without these optional modules installed, but usually with
+@@ -131,6 +136,13 @@
+ \fBremove\fR commands with the same
+ \fImodulename\fR argument,
+ \fBsoftdep\fR takes precedence.
+.TP
+\fBallow_unsupported_modules \fI[0|1]\fB \fR
+In SUSE kernels, every kernel module has a flag 'supported'. If
@@ -445,6 +425,6 @@
+Setting this option to 0 disables loading of unsupported modules
+and avoids tainting the kernel. This is typically set in
+\fI/etc/modprobe.d/unsupported-modules\fR\&.
- .SH "COPYRIGHT"
+ .SH "COMPATIBILITY"
.PP
- This manual page Copyright 2004, Rusty Russell, IBM Corporation.
+ A future version of module-init-tools will come with a strong warning
++++++ module-init-tools-suse.diff ++++++
--- /var/tmp/diff_new_pack.7iEQGT/_old 2010-06-02 18:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.7iEQGT/_new 2010-06-02 18:14:07.000000000 +0200
@@ -1,10 +1,10 @@
-This patch contains suse-specific changes against upstream commit a19a9982342f673bdfa2f8221ab47f1ba71a9989
+This patch contains suse-specific changes against upstream commit 837014acd25834c885af7859b41198c896d7c00f
diff --git a/depmod.c b/depmod.c
-index 5b90b3a..76305b9 100644
+index 647e5e6..a95957f 100644
--- a/depmod.c
+++ b/depmod.c
-@@ -193,7 +193,7 @@ static void load_module_symvers(const char *filename)
+@@ -195,7 +195,7 @@ static void load_module_symvers(const char *filename)
/* eg. "0xb352177e\tfind_first_bit\tvmlinux\tEXPORT_SYMBOL" */
while (fgets(line, sizeof(line)-1, module_symvers)) {
@@ -13,7 +13,7 @@
ver = strtok(line, " \t");
sym = strtok(NULL, " \t");
-@@ -201,7 +201,9 @@ static void load_module_symvers(const char *filename)
+@@ -203,7 +203,9 @@ static void load_module_symvers(const char *filename)
if (!ver || !sym || !where)
continue;
@@ -25,10 +25,10 @@
}
diff --git a/doc/modprobe.conf.sgml b/doc/modprobe.conf.sgml
-index cacc006..cd94511 100644
+index 74fdb7c..45c3172 100644
--- a/doc/modprobe.conf.sgml
+++ b/doc/modprobe.conf.sgml
-@@ -176,6 +176,19 @@
+@@ -205,6 +205,19 @@
</para>
</listitem>
</varlistentry>
@@ -48,12 +48,23 @@
</variablelist>
</refsect1>
<refsect1>
+
+# HACK - patch(1) is unable to delete the symlink, do this in the specfile
+# instead
+#diff --git a/doc/modprobe.d.sgml b/doc/modprobe.d.sgml
+#deleted file mode 120000
+#index ab88a6d..0000000
+#--- a/doc/modprobe.d.sgml
+#+++ /dev/null
+#@@ -1 +0,0 @@
+#-modprobe.conf.sgml
+#\ No newline at end of file
diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml
-index 69b2d84..b66afe7 100644
+index 85330e1..31da55c 100644
--- a/doc/modprobe.sgml
+++ b/doc/modprobe.sgml
-@@ -439,9 +439,28 @@
- </para>
+@@ -441,9 +441,28 @@
+ </para>
</listitem>
</varlistentry>
+ <varlistentry>
@@ -117,7 +128,7 @@
#define _printf __attribute__((format(printf, 1, 2)))
#else
diff --git a/modprobe.c b/modprobe.c
-index f97f17d..d9c53de 100644
+index 26a7163..4ddeea1 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -51,6 +51,9 @@
@@ -127,21 +138,18 @@
+/* Allow loading of unsupported modules? */
+static int allow_unsupported = 1;
+
- extern long init_module(void *, unsigned long, const char *);
- extern long delete_module(const char *, unsigned int);
+ /* Limit do_softdep/do_modprobe recursion.
+ * This is a simple way to handle dependency loops
+ * caused by poorly written softdep commands.
+@@ -80,6 +83,7 @@ typedef enum
+ mit_strip_modversion = 256,
+ mit_resolve_alias = 512
-@@ -70,8 +73,9 @@ typedef enum
- mit_ignore_loaded = 32,
- mit_strip_vermagic = 64,
- mit_strip_modversion = 128,
-- mit_resolve_alias = 256
-+ mit_resolve_alias = 256,
-
-+ mit_force_allow_unsupported = 1<<20,
++ ,mit_force_allow_unsupported = 1<<20
} modprobe_flags_t;
#ifndef MODULE_DIR
-@@ -355,6 +359,23 @@ static void clear_magic(struct elf_file *module)
+@@ -310,6 +314,23 @@ static void clear_magic(struct elf_file *module)
}
}
@@ -151,7 +159,7 @@
+ int j;
+
+ /* Grab from new-style .modinfo section. */
-+ tbl = module->ops->load_strings(module, ".modinfo", NULL, fatal);
++ tbl = module->ops->load_strings(module, ".modinfo", NULL);
+ for (j = 0; tbl && j < tbl->cnt; j++) {
+ const char *p = tbl->str[j];
+ if (streq(p, "supported=yes") ||
@@ -165,7 +173,7 @@
struct module_options
{
struct module_options *next;
-@@ -806,6 +827,16 @@ static int parse_config_file(const char *filename,
+@@ -947,6 +968,16 @@ static int parse_config_file(const char *filename,
if (streq(tmp, "no"))
use_binary_indexes = 0;
}
@@ -178,13 +186,13 @@
+ else if (streq(option, "no") || streq(option, "0"))
+ allow_unsupported = 0;
+ else
-+ grammar(cmd, filename, linenum);
- } else
++ goto syntax_error;
+ } else {
+ syntax_error:
grammar(cmd, filename, linenum);
-
-@@ -1163,6 +1194,17 @@ static int insmod(struct list_head *list,
+@@ -1407,6 +1438,17 @@ static int insmod(struct list_head *list,
strerror(errno));
- goto out_unlock;
+ goto out;
}
+ /* Supported? */
+ if (!allow_unsupported && !module_supported(module)) {
@@ -197,13 +205,13 @@
+ goto out;
+ }
+
- if (newname)
- rename_module(module, mod->modname, newname);
if (flags & mit_strip_modversion)
-@@ -1345,6 +1387,16 @@ int do_modprobe(char *modname,
- /* Returns the resolved alias, options */
- parse_toplevel_config(configname, modname, 0,
- flags & mit_remove, &modoptions, &commands, &aliases, &blacklist);
+ module->ops->strip_section(module, "__versions");
+ if (flags & mit_strip_vermagic)
+@@ -1591,6 +1633,17 @@ int do_modprobe(const char *modname,
+ LIST_HEAD(list);
+ int failed = 0;
+
+ if (flags & mit_force_allow_unsupported)
+ allow_unsupported = 1;
+ /* Be nice to people running non-suse kernels and allow
@@ -214,10 +222,11 @@
+ errno == ENOENT)
+ allow_unsupported = 1;
+ }
++
+ matching_aliases = find_aliases(conf->aliases, modname);
- /* Read module options from kernel command line */
- parse_kcmdline(0, &modoptions);
-@@ -1437,6 +1489,7 @@ static struct option options[] = { { "version", 0, NULL, 'V' },
+ /* No luck? Try symbol names, if starts with symbol:. */
+@@ -1694,6 +1747,7 @@ static struct option options[] = { { "version", 0, NULL, 'V' },
{ "force-modversion", 0, NULL, 2 },
{ "first-time", 0, NULL, 3 },
{ "dump-modversions", 0, NULL, 4 },
@@ -225,7 +234,7 @@
{ NULL, 0, NULL, 0 } };
int main(int argc, char *argv[])
-@@ -1544,6 +1597,9 @@ int main(int argc, char *argv[])
+@@ -1800,6 +1854,9 @@ int main(int argc, char *argv[])
case 4:
dump_modver = 1;
break;
@@ -235,8 +244,15 @@
default:
print_usage(argv[0]);
}
+diff --git a/modprobe.d.5 b/modprobe.d.5
+index d0ed026..a83566a 100644
+--- a/modprobe.d.5
++++ b/modprobe.d.5
+@@ -1 +1 @@
+-.so modprobe.conf.5
++.so man5/modprobe.conf.5
diff --git a/zlibsupport.c b/zlibsupport.c
-index b159765..0f78524 100644
+index 597820e..0f78524 100644
--- a/zlibsupport.c
+++ b/zlibsupport.c
@@ -12,6 +12,8 @@
@@ -248,7 +264,7 @@
#include "zlibsupport.h"
#include "logging.h"
-@@ -19,69 +21,35 @@
+@@ -19,52 +21,35 @@
#ifdef CONFIG_USE_ZLIB
#include
@@ -261,7 +277,8 @@
- unsigned int max = 16384;
- void *buffer = NOFAIL(malloc(max));
- int ret;
--
++ unsigned char magic[2];
+
- *size = 0;
- while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) {
- *size += ret;
@@ -274,8 +291,6 @@
- }
-
- return buffer;
-+ unsigned char magic[2];
-+
+ if (read(fd, magic, 2) != 2)
+ return -1;
+ lseek(fd, 0, SEEK_SET);
@@ -284,36 +299,10 @@
+ return 0;
}
--void *grab_fd(int fd, unsigned long *size)
-+static char *tmpdir(void)
- {
-- gzFile gzfd;
--
-- gzfd = gzdopen(fd, "rb");
-- if (!gzfd) {
-- if (errno == ENOMEM)
-- fatal("Memory allocation failure in gzdopen\n");
-- return NULL;
-- }
--
-- /* gzclose(gzfd) would close fd, which would drop locks.
-- Don't blame zlib: POSIX locking semantics are so horribly
-- broken that they should be ripped out. */
-- return grab_contents(gzfd, size);
-+ static char *TMPDIR;
-+
-+ if (TMPDIR)
-+ return TMPDIR;
-+ TMPDIR = getenv("TMPDIR");
-+ if (!TMPDIR)
-+ TMPDIR = "/tmp";
-+ return TMPDIR;
- }
-+#endif
-
-/* gzopen handles uncompressed files transparently. */
-void *grab_file(const char *filename, unsigned long *size)
--{
++static char *tmpdir(void)
+ {
- gzFile gzfd;
- void *buffer;
-
@@ -328,19 +317,27 @@
- gzclose(gzfd);
- return buffer;
-}
--
++ static char *TMPDIR;
+
-void release_file(void *data, unsigned long size)
-{
- free(data);
--}
++ if (TMPDIR)
++ return TMPDIR;
++ TMPDIR = getenv("TMPDIR");
++ if (!TMPDIR)
++ TMPDIR = "/tmp";
++ return TMPDIR;
+ }
-#else /* ... !CONFIG_USE_ZLIB */
--
++#endif
+
-void *grab_fd(int fd, unsigned long *size)
+void *do_grab_fd(int fd, unsigned long *size)
{
struct stat st;
void *map;
-@@ -97,6 +65,60 @@ void *grab_fd(int fd, unsigned long *size)
+@@ -80,6 +65,60 @@ void *grab_fd(int fd, unsigned long *size)
return map;
}
@@ -401,7 +398,7 @@
void *grab_file(const char *filename, unsigned long *size)
{
int fd;
-@@ -114,4 +136,4 @@ void release_file(void *data, unsigned long size)
+@@ -97,4 +136,4 @@ void release_file(void *data, unsigned long size)
{
munmap(data, size);
}
++++++ module-init-tools-upstream.diff ++++++
This patch contains upstream changes since 3.12-pre3 up to commit 837014acd25834c885af7859b41198c896d7c00f
diff --git a/depmod.c b/depmod.c
index 89e4c43..647e5e6 100644
--- a/depmod.c
+++ b/depmod.c
@@ -979,6 +979,43 @@ static int output_softdeps(struct module *modules, FILE *out, char *dirname)
return 1;
}
+static int output_devname(struct module *modules, FILE *out, char *dirname)
+{
+ struct module *m;
+
+ fprintf(out, "# Device nodes to trigger on-demand module loading.\n");
+ for (m = modules; m != NULL; m = m->next) {
+ struct string_table *tbl;
+ int i;
+ char type = '\0';
+ const char *devname = NULL;
+
+ tbl = m->file->ops->load_strings(m->file, ".modinfo", NULL);
+ for (i = 0; tbl && i < tbl->cnt; i++) {
+ const char *p = tbl->str[i];
+ unsigned int maj, min;
+
+ if (sscanf(p, "alias=char-major-%u-%u", &maj, &min) == 2)
+ type = 'c';
+ else if (sscanf(p, "alias=block-major-%u-%u", &maj, &min) == 2)
+ type = 'b';
+ else if (strstarts(p, "alias=devname:"))
+ devname = &p[strlen("alias=devname:")];
+
+ if (type && devname) {
+ char modname[strlen(m->pathname)+1];
+
+ filename2modname(modname, m->pathname);
+ fprintf(out, "%s %s %c%u:%u\n",
+ modname, devname, type, maj, min);
+ break;
+ }
+ }
+ strtbl_free(tbl);
+ }
+ return 1;
+}
+
struct depfile {
char *name;
int (*func)(struct module *, FILE *, char *dirname);
@@ -1002,6 +1039,7 @@ static struct depfile depfiles[] = {
{ "modules.symbols", output_symbols, 0 },
{ "modules.symbols.bin", output_symbols_bin, 0 },
{ "modules.builtin.bin", output_builtin_bin, 0 },
+ { "modules.devname", output_devname, 0 },
};
/* If we can't figure it out, it's safe to say "true". */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org