Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2017-12-09 20:25:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod"
Sat Dec 9 20:25:40 2017 rev:45 rq:555182 version:24
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2017-12-01
15:53:28.920374179 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-12-09
20:25:44.734528653 +0100
@@ -1,0 +2,6 @@
+Thu Dec 7 12:56:32 UTC 2017 - msucha...@suse.com
+
+- Fix resolving .TOC. in modules on 4.4 and older kernel (bsc#1070209)
+ depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
+
+-------------------------------------------------------------------
New:
----
depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.A9gp0r/_old 2017-12-09 20:25:45.546489978 +0100
+++ /var/tmp/diff_new_pack.A9gp0r/_new 2017-12-09 20:25:45.550489788 +0100
@@ -34,6 +34,7 @@
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6: depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -105,7 +106,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%build
autoreconf -fi
++++++ depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch ++++++
>From d43ed9df0c22aa06b254b86dcf6dfbad04699242 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Thu, 7 Dec 2017 13:51:31 +0100
Subject: [PATCH] depmod: Don't add .TOC. when it's in the kernel.
References: bsc#1070209
d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol") adds fake
.TOC. unconditionally but when there is .TOC. in the kernel adding the
fake one breaks resolving .TOC.
Fixes: d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol")
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
tools/depmod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/depmod.c b/tools/depmod.c
index 7ff3e9ed191e..9db602d76ee4 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2480,7 +2480,8 @@ static void depmod_add_fake_syms(struct depmod *depmod)
/* On S390, this is faked up too */
depmod_symbol_add(depmod, "_GLOBAL_OFFSET_TABLE_", true, 0, NULL);
/* On PowerPC64 ABIv2, .TOC. is more or less _GLOBAL_OFFSET_TABLE_ */
- depmod_symbol_add(depmod, "TOC.", true, 0, NULL);
+ if (!depmod_symbol_find(depmod, "TOC."))
+ depmod_symbol_add(depmod, "TOC.", true, 0, NULL);
}
static int depmod_load_symvers(struct depmod *depmod, const char *filename)
--
2.13.6
