From b34a07eb55b94f7fd9319884e716da9ed738eba12c0196efb3b18d13502eeeda Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Dec 2012 11:55:50 +0000 Subject: [PATCH 1/3] kmod-12 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=47 --- kmod-11.tar.sign | 17 ----------------- kmod-11.tar.xz | 3 --- kmod-12.tar.sign | 17 +++++++++++++++++ kmod-12.tar.xz | 3 +++ kmod.changes | 10 ++++++++++ kmod.spec | 6 ++---- 6 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 kmod-11.tar.sign delete mode 100644 kmod-11.tar.xz create mode 100644 kmod-12.tar.sign create mode 100644 kmod-12.tar.xz diff --git a/kmod-11.tar.sign b/kmod-11.tar.sign deleted file mode 100644 index 1ee9206..0000000 --- a/kmod-11.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAABAgAGBQJQmzW4AAoJEJuipaYwy+pT3RkP/2R3GpGGiaDlk74H7Lzgv2Iw -4287R5HTN0sLx9MGFdxUvGFs2PLy+FORzN1aqbNzdGpyrPDZc62Fgyc4kjCwCVKh -cYkF/xsMnFUVnkWqOah+IYYV7TrHb1Vr+6d7CStVw6Z4JMEet0/eE54oJxGddXBJ -NyPYxzTvSKpDUU3Y7lC3SK5yNOPMPQ+HvDB7Vbe+YUU9oQMYmXZw/QQJnT/KvzUK -F196eNRjsCNLG6yQ/u/FH+Z5G6nxTbIDxzBgvV427ZZhKKg20C9XtNPluhkxQ+rf -HVZ8F44ol+nmrKQdtBJpCqKW7sDs7ULZLBdkEnttKZejWU2gToDu2eW0AKrMt8mE -8LYDpANU1sa6ZdNEb5nNB9fy+UakAa8f1rPKFtmPTVZpw3DvViIXIukvMT47H8zD -NAkxxMJa39V9+29Hqqz70971VmFaJCSGCMxTMihoiv7fTyAikOz8mK8esZLrLJku -1nmfTiVDD0TMNttTApESwPs4GuftGyO+0Te47JbrBK+fvWLKz7HR4FHBnEakbR7e -NslSlD6a8eNiDRSCxKS//0bSmR7KFHdrYVzRViVO3XB2fqshgXfgGtfwt9P2E96y -ZDbNYzPMxhpO0aWoHw4Z+8QWJ/zrHf5Qhbg38OosQNWWK5Hv08lMUxqYa+4VH3Ap -obmKGEwXDXdOPhoLDy6n -=XcLH ------END PGP SIGNATURE----- diff --git a/kmod-11.tar.xz b/kmod-11.tar.xz deleted file mode 100644 index 5129ae1..0000000 --- a/kmod-11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28604e153833571ff6ebf34ad1722d3aca4d3d1760ad069a1f06d8fe5efd1de9 -size 1274992 diff --git a/kmod-12.tar.sign b/kmod-12.tar.sign new file mode 100644 index 0000000..6eca5cd --- /dev/null +++ b/kmod-12.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAABAgAGBQJQvsJyAAoJEJuipaYwy+pTYEQP/0sQCUaY2QAm7A8eECsgTuP6 +MC8gZ0jWFoXwamHTg16cuc1lwTbih0RNY4aUevuqKsSvzh5xPMJ7nky6fg9qDJTr +bh6gI1GKIf9VDnVE1n6ZUaWz12RI0p2jTZHRgj/85xUxYEWhT01m40MLqwDm+H6/ +xM+yqfxQ/6eqbuQTHTu/iu/xkrt+vjA0u54HGk/twyxQNx2CIypXK88sLFmB9qwt +xRC85ASm78Q3m06TAVXIVlIoI0zJV641TdwtZoRt6jpP4wrO1+mTUw5Y11zI17/+ +dMmnbm+R8Qc0mtzjKySfkb5qIdP5PFVRQmwhAweN+Qp7I02i2JrWQalsHgKKcB/6 +Cn8/CCjDRbj4K0RPtfiN7nHaiBqkczpCaMurFhcnoQXMFuL4hWbf89KMV127uozX +IKGJSvsPGFfZPa+C8cfWWnmXodf5h/Dc+r80Nls2HfA5aKoYo/zHjFknoFr9zmGc +npudytWt/DsOVvtHacdNwq6azhJOWq86T/cizPeOdfmHDl9n2HBLf8psrl8ZwLXB +HZ4E14xcg3iogSevxnmZppO7a8htcvDT3cPTyokAZ/4uelYiMw4nHtFL09aBNB9q +0yd1+BuARefc8B+Ic+ENVoPJsHTXnAygYbSlt6LEBIoAZQPkZ8sHs5EnqiYxW0L4 +tU07Ph7qaBq08vBgjohU +=ZXI1 +-----END PGP SIGNATURE----- diff --git a/kmod-12.tar.xz b/kmod-12.tar.xz new file mode 100644 index 0000000..0d2535a --- /dev/null +++ b/kmod-12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f +size 1275028 diff --git a/kmod.changes b/kmod.changes index 5c9bde3..c53cbd3 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 6 11:53:05 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 12 +* Fix removing vermagic from module when told to force load a module +* Fix removing __versions section when told to force load a + module: we need to mangle the section header, not the section. +* modinfo no longer fails while loading a module from file when + path contains ".ko" substring + ------------------------------------------------------------------- Fri Nov 23 17:18:03 UTC 2012 - jengelh@inai.de diff --git a/kmod.spec b/kmod.spec index 02bb267..c366d93 100644 --- a/kmod.spec +++ b/kmod.spec @@ -21,7 +21,7 @@ Name: kmod Summary: Utilities to load modules into the kernel License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version: 11 +Version: 12 Release: 0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ #Announce: https://lwn.net/Articles/502622/ @@ -131,7 +131,7 @@ mkdir -p "$b"/{bin,sbin,%_lib}; ln -s "%_bindir/kmod" "$b/bin/"; %if "%_libdir" != "/%_lib" ln -s "%_libdir/libkmod.so.2" "$b/%_lib/"; -ln -s "%_libdir/libkmod.so.2.2.1" "$b/%_lib/"; +ln -s "%_libdir/libkmod.so.2.2.2" "$b/%_lib/"; %endif %check @@ -141,8 +141,6 @@ make check V=1 || :; %postun -n %lname -p /sbin/ldconfig -%clean - %files %defattr(-,root,root) %_bindir/kmod From 6723e26bc51506291954bfb4d646032078d61c229ec41bf3bc3a731a9f7efd30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Dec 2012 12:07:17 +0000 Subject: [PATCH 2/3] Older deps OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=48 --- kmod.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kmod.spec b/kmod.spec index c366d93..93ce801 100644 --- a/kmod.spec +++ b/kmod.spec @@ -31,7 +31,11 @@ Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-modul Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1220 BuildRequires: libxslt-tools +%else +BuildRequires: libxslt +%endif BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 From 6f4127f4d95add62daefcc7552cf19883a97e7f5c2b247a5a82435911d259a17 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Dec 2012 12:09:55 +0000 Subject: [PATCH 3/3] SLES build OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=49 --- kmod.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kmod.spec b/kmod.spec index 93ce801..2194245 100644 --- a/kmod.spec +++ b/kmod.spec @@ -38,8 +38,13 @@ BuildRequires: libxslt %endif BuildRequires: pkgconfig >= 0.21 BuildRequires: xz +%if 0%{?sles_version} +BuildRequires: xz-devel >= 4.99 +BuildRequires: zlib-devel +%else BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) +%endif Requires: suse-module-tools %description @@ -95,6 +100,9 @@ in %lname. # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ +%if 0%{?sles_version} + zlib_CFLAGS=" " zlib_LIBS="-lz" \ +%endif --with-xz \ --with-zlib \ --includedir="%_includedir/%name-%version" \