SHA256
1
0
forked from pool/kmod

Accepting request 144408 from Base:System

- 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

OBS-URL: https://build.opensuse.org/request/show/144408
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2012-12-10 11:19:42 +00:00 committed by Git OBS Bridge
commit ff175cf637
6 changed files with 44 additions and 24 deletions

View File

@ -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-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28604e153833571ff6ebf34ad1722d3aca4d3d1760ad069a1f06d8fe5efd1de9
size 1274992

17
kmod-12.tar.sign Normal file
View File

@ -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-----

3
kmod-12.tar.xz Normal file
View File

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

View File

@ -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 Fri Nov 23 17:18:03 UTC 2012 - jengelh@inai.de

View File

@ -21,7 +21,7 @@ Name: kmod
Summary: Utilities to load modules into the kernel Summary: Utilities to load modules into the kernel
License: LGPL-2.1+ and GPL-2.0+ License: LGPL-2.1+ and GPL-2.0+
Group: System/Kernel Group: System/Kernel
Version: 11 Version: 12
Release: 0 Release: 0
Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/502622/ #Announce: https://lwn.net/Articles/502622/
@ -31,11 +31,20 @@ 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 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 Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1220
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
%else
BuildRequires: libxslt
%endif
BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig >= 0.21
BuildRequires: xz BuildRequires: xz
%if 0%{?sles_version}
BuildRequires: xz-devel >= 4.99
BuildRequires: zlib-devel
%else
BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(liblzma) >= 4.99
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%endif
Requires: suse-module-tools Requires: suse-module-tools
%description %description
@ -91,6 +100,9 @@ in %lname.
# The extra --includedir gives us the possibility to detect dependent # The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig. # packages which fail to properly use pkgconfig.
%configure \ %configure \
%if 0%{?sles_version}
zlib_CFLAGS=" " zlib_LIBS="-lz" \
%endif
--with-xz \ --with-xz \
--with-zlib \ --with-zlib \
--includedir="%_includedir/%name-%version" \ --includedir="%_includedir/%name-%version" \
@ -131,7 +143,7 @@ mkdir -p "$b"/{bin,sbin,%_lib};
ln -s "%_bindir/kmod" "$b/bin/"; ln -s "%_bindir/kmod" "$b/bin/";
%if "%_libdir" != "/%_lib" %if "%_libdir" != "/%_lib"
ln -s "%_libdir/libkmod.so.2" "$b/%_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 %endif
%check %check
@ -141,8 +153,6 @@ make check V=1 || :;
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%clean
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/kmod %_bindir/kmod