Hello community,
here is the log from the commit of package module-init-tools for openSUSE:Factory
checked in at Thu Jun 9 14:30:27 CEST 2011.
--------
--- module-init-tools/module-init-tools.changes 2010-08-27 14:47:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2011-06-03 15:32:03.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Jun 3 14:41:05 CEST 2011 - mmarek@suse.cz
+
+- weak-modules2: Allow to force a mkinitrd run on KMP install
+ (fate#309400)
+- commit 8f67d56
+
+-------------------------------------------------------------------
+Tue May 31 11:57:45 CEST 2011 - mmarek@suse.cz
+
+- Update to 3.13
+ * Support for X.Y kernel versions.
+ * Configuration is read from /lib/modprobe.d and /etc/modprobe.d,
+ shipped configs should move to lib.
+- Remove support for "build-in" in Module.symvers, the kernel packages
+ do not do that anymore.
+- commit aa338fa
+
+-------------------------------------------------------------------
+Tue Nov 23 16:05:47 CET 2010 - mmarek@suse.cz
+
+- weak-modules2: Do not leave empty /lib/modules/* directories around
+- commit 85ae175
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
module-init-tools-3.12-pre3.tar.bz2
module-init-tools-upstream.diff
New:
----
module-init-tools-3.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.qhqq04/_old 2011-06-09 14:29:44.000000000 +0200
+++ /var/tmp/diff_new_pack.qhqq04/_new 2011-06-09 14:29:44.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package module-init-tools (Version 3.12)
+# spec file for package module-init-tools
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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.12
-Release: 5
-License: GPLv2+
+Version: 3.13
+Release: 1
+License: GPL v2 or later
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,8 +67,8 @@
Jon Masters
%prep
-%setup -q -n module-init-tools-3.12-pre3 -a2
-%patch1 -p1
+%setup -q -n module-init-tools-3.13 -a2
+# patch1 -p1
%patch2 -p1
%patch3 -p1
++++++ module-init-tools-3.12-pre3.tar.bz2 -> module-init-tools-3.13.tar.bz2 ++++++
++++ 7705 lines of diff (skipped)
++++++ module-init-tools-manpages.diff ++++++
--- /var/tmp/diff_new_pack.qhqq04/_old 2011-06-09 14:29:44.000000000 +0200
+++ /var/tmp/diff_new_pack.qhqq04/_new 2011-06-09 14:29:44.000000000 +0200
@@ -10,7 +10,7 @@
+.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
-+.TH "MODPROBE" "8" "27 August 2010" "" ""
++.TH "MODPROBE" "8" "03 June 2011" "" ""
+
.SH NAME
modprobe \- program to add and remove modules from the Linux Kernel
@@ -293,14 +293,14 @@
--- a/modprobe.conf.5
+++ b/modprobe.conf.5
@@ -1,5 +1,10 @@
--.\\" auto-generated by docbook2man-spec $Revision: 1.2 $
+-.\" auto-generated by docbook2man-spec from docbook-utils package
-.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" "27 August 2010" "" ""
++.TH "MODPROBE.CONF" "5" "03 June 2011" "" ""
+
.SH NAME
modprobe.d, modprobe.conf \- Configuration directory/file for modprobe
++++++ module-init-tools-suse.diff ++++++
--- /var/tmp/diff_new_pack.qhqq04/_old 2011-06-09 14:29:44.000000000 +0200
+++ /var/tmp/diff_new_pack.qhqq04/_new 2011-06-09 14:29:44.000000000 +0200
@@ -1,29 +1,5 @@
-This patch contains suse-specific changes against upstream commit 837014acd25834c885af7859b41198c896d7c00f
+This patch contains suse-specific changes against upstream commit 768b9984b254d0dbb3f21f5a75adeb2a8bab1edf
-diff --git a/depmod.c b/depmod.c
-index 647e5e6..a95957f 100644
---- a/depmod.c
-+++ b/depmod.c
-@@ -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)) {
-- const char *ver, *sym, *where;
-+ const char *ver, *sym, *where, *slash;
-
- ver = strtok(line, " \t");
- sym = strtok(NULL, " \t");
-@@ -203,7 +203,9 @@ static void load_module_symvers(const char *filename)
- if (!ver || !sym || !where)
- continue;
-
-- if (streq(where, "vmlinux"))
-+ if (streq(where, "vmlinux") ||
-+ (((slash = strrchr(where, '/'))) &&
-+ streq(slash, "/built-in")))
- add_symbol(sym, strtoull(ver, NULL, 16), NULL);
- }
-
diff --git a/doc/modprobe.conf.sgml b/doc/modprobe.conf.sgml
index 74fdb7c..45c3172 100644
--- a/doc/modprobe.conf.sgml
@@ -117,12 +93,12 @@
#define _printf __attribute__((format(printf, 1, 2)))
#else
diff --git a/modprobe.c b/modprobe.c
-index 26a7163..4ddeea1 100644
+index 6d30f39..144af3e 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -51,6 +51,9 @@
- int use_binary_indexes = 1; /* default to enabled. */
+ static int use_binary_indexes = 1; /* default to enabled. */
+/* Allow loading of unsupported modules? */
+static int allow_unsupported = 1;
@@ -162,7 +138,7 @@
struct module_options
{
struct module_options *next;
-@@ -947,6 +968,16 @@ static int parse_config_file(const char *filename,
+@@ -946,6 +967,16 @@ static int parse_config_file(const char *filename,
if (streq(tmp, "no"))
use_binary_indexes = 0;
}
@@ -179,7 +155,7 @@
} else {
syntax_error:
grammar(cmd, filename, linenum);
-@@ -1407,6 +1438,17 @@ static int insmod(struct list_head *list,
+@@ -1446,6 +1477,17 @@ static int insmod(struct list_head *list,
strerror(errno));
goto out;
}
@@ -197,7 +173,7 @@
if (flags & mit_strip_modversion)
module->ops->strip_section(module, "__versions");
if (flags & mit_strip_vermagic)
-@@ -1591,6 +1633,17 @@ int do_modprobe(const char *modname,
+@@ -1630,6 +1672,17 @@ static int do_modprobe(const char *modname,
LIST_HEAD(list);
int failed = 0;
@@ -215,7 +191,7 @@
matching_aliases = find_aliases(conf->aliases, modname);
/* No luck? Try symbol names, if starts with symbol:. */
-@@ -1694,6 +1747,7 @@ static struct option options[] = { { "version", 0, NULL, 'V' },
+@@ -1733,6 +1786,7 @@ static const struct option options[] = { { "version", 0, NULL, 'V' },
{ "force-modversion", 0, NULL, 2 },
{ "first-time", 0, NULL, 3 },
{ "dump-modversions", 0, NULL, 4 },
@@ -223,7 +199,7 @@
{ NULL, 0, NULL, 0 } };
int main(int argc, char *argv[])
-@@ -1800,6 +1854,9 @@ int main(int argc, char *argv[])
+@@ -1839,6 +1893,9 @@ int main(int argc, char *argv[])
case 4:
dump_modver = 1;
break;
++++++ weak-modules2 ++++++
--- /var/tmp/diff_new_pack.qhqq04/_old 2011-06-09 14:29:44.000000000 +0200
+++ /var/tmp/diff_new_pack.qhqq04/_new 2011-06-09 14:29:44.000000000 +0200
@@ -305,6 +305,12 @@
echo "Please run mkinitrd as soon as your system is complete." >&2
return 1
fi
+ # KMPs can force mkinitrd run with %kernel_module_package -b that sets
+ # this variable
+ if test -n "$KMP_NEEDS_MKINITRD" && \
+ ! test "$KMP_NEEDS_MKINITRD" -eq 0 2>/dev/null; then
+ return 0
+ fi
if [ "$changed_basenames" = "_kernel_" ]; then
return 0
fi
@@ -417,6 +423,8 @@
if [ -d $dir/weak-updates ]; then
rm -rf $dir/weak-updates
fi
+ # If there are no KMPs left, remove the empty directory
+ rmdir $dir 2>/dev/null
}
add_kernel_modules() {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org