Accepting request 572302 from Base:System

forward 571723

OBS-URL: https://build.opensuse.org/request/show/572302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=46

depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch

@@ -1,35 +0,0 @@
-From d43ed9df0c22aa06b254b86dcf6dfbad04699242 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@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 <msuchanek@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
-

kmod-24.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJYr+ITAAoJEJuipaYwy+pTiTEQAJpnw1how50xfJoExE2EKHYP
-q65cVBT7hL5BgGJz3mLx/MctxX1lZe8/3xh15IQ2E6g9PF8RwEC0zmsxeS5mMqys
-QbtcfjF3qimnHCMUR90W0pfTd/Jj5tRbMPgv9aNInBFxefSv3TkvXPCJ4H3/1TjV
-kfuE0CsCoCSbIDlnEUf4WzyhKjbtVBq99D51RtpykOGVCE3JiVP2qUgqt0wnkmyT
-2XZWT7gLWsNcDlZc0DrazXb+fZmZzkAXY1Y9kwfoMVz6y0naihy8etEGDYFdvyXg
-1usoR8NKfSKfNR9s2X6CqOvj5awBFeD2uu0IQi8R6pLqZq5vYhI5wYFqZZDe5NSC
-Xb6psibRnodtPyeuHwispEh7uoPPVQQY84INQL2p5ZUnXH7tvbw0qcyDMdpQXXQ2
-jLNsuicD6Sf9tknY3TkyPjj916uSJKdaYYqKkBsazob2ChpIewmZMfCqhxLCATFi
-STm4YOfZnGS6VJcWt/ujvCFqVqh75X/9Vo3b1e7C7gFoz9RJ5JiuxcYvRizQaMPE
-1/EH5Fp9GPyAgfr9bTnCdVFE1swa/6yrMjNd9HjxWdW+/fgRboteErwk7+Kr4qV0
-UBCGEwlWWCSa1l2Xi4PganiYStjr65eNOR7M5yg9+2t0pUFj8HSp+kcZqN2FklIB
-Bq2XMuoABG2TqOl3+VyS
-=zuNi
------END PGP SIGNATURE-----

kmod-24.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397
-size 536864

kmod-25.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJaVBxEAAoJEJuipaYwy+pTv2UQAKlYoKuWqjq3IWgqCS+6JA6E
++gCo0UUhh7Jwu77+ZHyZ0y53UKfNLdY+PXDafAzx9vF8L702U2AE7CzYUO911Z/s
+Hx+p6BXHhkPcwN3Eo1q8jSs2rsz5BEkOcA0r6S5k/i0BHCJxW/amJSub+jEn6MHx
+cbBaUHX3AgTz+dpSJuwQdwJhRUBRKz9UadB8AKi64OXvXkbm6up6HZjiL5yeKJPw
+yXFlhCMyrwLacNFKFwKJLgdmljueHRSZyrqFMbkIoyjWdlTUQas6CxVo8PO4k/5L
+j/n7ttqNIo0+/qC/+HGG9UADNztjIaRbsLLZTXYYXaqrwIuBl0RBMpn5JqB5j3n3
+PkmS9EjxCcMCcVtpiV/2bY+HCsQZI0obeYk+0SK3iSE0SRqltfXNpTMlVQuiB+wA
+sggpkwx9Uq6FnmpS8uPraFJ7sCsoSaDby8Ye6NXKH4o/DqBRORbdF8H3+ZF6BWGk
+mADU1EHIvLCXGyCE8f6CZOTP3GPNZonWbcId2RfpsBegb3i+P8NLJ+jwSEavJRXw
+kuVq9hz5QsSjeCyz0bupYYZ58vgWpQSFKt8AWqoqVZ+Lz6knROiWerZGEzt7hi9V
+KaxDr7SyBCxouuG7CP1h5J6zyAiY0NkzGgoluiDFgZE/XwP6nlRJiPboCO9d5bFX
+cIpbHoJB4E4GPmfgzB3Z
+=xgwm
+-----END PGP SIGNATURE-----

kmod-25.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd
+size 545416

kmod-testsuite.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  1 13:49:25 UTC 2018 - msuchanek@suse.com
+
+- Update to kmod v25
+
 -------------------------------------------------------------------
 Thu Jul  6 08:07:50 UTC 2017 - jengelh@inai.de
 

kmod-testsuite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kmod-testsuite
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           kmod-testsuite
 %define lname	libkmod2
-Version:        24
+Version:        25
 Release:        0
 Summary:        Testsuite of the kmod package
 License:        LGPL-2.1+ and GPL-2.0+

kmod.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb  1 13:49:25 UTC 2018 - msuchanek@suse.com
+
+- Update to kmod v25
+  * Fix resolving symbols with MODULE_REL_CRCS (bsc#1077867)
+- Drop depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
+
 -------------------------------------------------------------------
 Thu Dec  7 12:56:32 UTC 2017 - msuchanek@suse.com
 

kmod.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kmod
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           kmod
 %define lname	libkmod2
-Version:        24
+Version:        25
 Release:        0
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1+ and GPL-2.0+
@@ -34,7 +34,6 @@ Patch2:         0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
 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
@@ -45,7 +44,7 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(liblzma) >= 4.99
 BuildRequires:  pkgconfig(zlib)
 Requires(post): coreutils
-Conflicts:      kmod-compat < 24
+Conflicts:      kmod-compat < %version
 
 %description
 kmod is a set of tools to handle common tasks with Linux kernel
@@ -95,7 +94,7 @@ list modules, also checking its properties, dependencies and aliases.
 Summary:        Development files for libkmod
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %lname = %version
 
 %description -n libkmod-devel
 libkmod was created to allow programs to easily insert, remove and
@@ -106,7 +105,7 @@ in %lname.
 
 %prep
 %setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
 
 %build
 autoreconf -fi