SHA256
1
0
forked from pool/kmod
Jan Engelhardt 2012-02-07 00:59:10 +00:00 committed by Git OBS Bridge
parent 015c7fa12a
commit b142ac7be3
6 changed files with 76 additions and 21 deletions

View File

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

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

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPMFn6AAoJEJuipaYwy+pTs1MP/1itv8M+ucm4k/dmgWDiA5D5
LS1m3A63kuC4v4Bf38AVh6dkj/b9A2wqcOkmaHGffxf+tFSYPrzN/aXLT3kuzOWd
aDICCr41Sd38HmbphRURCuaJQAJqWKQwT4Ap8hHr7COewr0jAaWDHreQgSJtEn0x
a8con4ps2IghNQYkKtJIuAn8cAkRlAcE5LUn+/n5dMPUipirFNCUcj2CAUzbUNnm
7NCPxA3wXpebtmXo8Fu6NEvPmZd4JQNz7AHAUiFoMXjoxmSVhCA1rs9f05GuiHF5
koLziYSB1Mf76RPZr3YT2r7032qlBMzpyGOxqgXNpDPCbIvJj4wBMJltYa0sf5M5
94a6J9wkBfGqLx5qCjWVNUWQuttmLReqdvWxn8mAebVatj+/Y7AvbkOLEF580Ojd
sgR2B0MB41GU4kUlToI/M045kre83e/o+ylOomgsAgRCtBr0yHS2tGvow9h5CxiB
cibzwK5T7jF3PJ9HM7xh4eq9R9jazJKaZJ2Ebofg3KfcRWNfZTIdbbHycGFgioP+
08pewY04s4Y/R21cCNLc+pxLQOt6ZkRbXMtrx5hfhJm0yxaG9ozrkB8A2BJTnpHX
8EJ4iFzjNmtlM79o4fpBEuCrleHtFvFso+KZoDGREFP1H5TcxQ6HcAK2t5AF39O1
2VKNW0UU7WfqCZNkztIz
=dWRa
-----END PGP SIGNATURE-----

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

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

32
kmod-so-version.diff Normal file
View File

@ -0,0 +1,32 @@
kmod broke versioning starting with kmod v5.
References: <alpine.LNX.2.01.1202070049200.12889@frira.zrqbmnf.qr>
References: http://article.gmane.org/gmane.linux.kernel.modules/705
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: kmod-5/Makefile.am
===================================================================
--- kmod-5.orig/Makefile.am
+++ kmod-5/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST += libkmod/libkmod.sym
EXTRA_DIST += libkmod/COPYING libkmod/README
libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
+ -release ${PACKAGE_VERSION} \
-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
libkmod_libkmod_la_DEPENDENCIES = libkmod/libkmod-util.la \
${top_srcdir}/libkmod/libkmod.sym
@@ -96,7 +96,7 @@ install-exec-hook:
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libkmod.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \
- mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \
+ mv $(DESTDIR)$(libdir)/libkmod-${PACKAGE_VERSION}.so $(DESTDIR)$(rootlibdir); \
fi
uninstall-hook:

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 7 00:56:51 UTC 2012 - jengelh@medozas.de
- Update to new upstream release 5
* modprobe no longer works with paths: it only accepts module names
and/or aliases now. More code is now shared by libkmod and
modprobe.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 20 18:13:50 UTC 2012 - jengelh@medozas.de Fri Jan 20 18:13:50 UTC 2012 - jengelh@medozas.de

View File

@ -15,27 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: kmod Name: kmod
%define lname libkmod1 %define lname libkmod-5
Summary: Utilities to load modules into the kernel Summary: Utilities to load modules into the kernel
Version: 4
Release: 0
%define git_snapshot 0
License: LGPL-2.1+ and GPL-2.0+ License: LGPL-2.1+ and GPL-2.0+
Group: System/Kernel Group: System/Kernel
Version: 5
Release: 0
Url: http://www.politreco.com/2011/12/announce-kmod-2/ Url: http://www.politreco.com/2011/12/announce-kmod-2/
#Git-Clone: git://git.profusion.mobi/kmod #Git-Clone: git://git.profusion.mobi/kmod
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: kmod-so-version.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?git_snapshot} BuildRequires: autoconf
BuildRequires: autoconf automake libtool BuildRequires: automake
%endif BuildRequires: libtool
BuildRequires: pkgconfig >= 0.23 pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig >= 0.23
BuildRequires: pkgconfig(zlib) xz BuildRequires: xz
BuildRequires: pkgconfig(liblzma) >= 4.99
BuildRequires: pkgconfig(zlib)
%description %description
kmod is a set of tools to handle common tasks with Linux kernel kmod is a set of tools to handle common tasks with Linux kernel
@ -70,8 +70,8 @@ list modules, also checking its properties, dependencies and aliases.
%package -n libkmod-devel %package -n libkmod-devel
Summary: Development files for libkmod Summary: Development files for libkmod
Group: Development/Libraries/C and C++
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %lname = %version Requires: %lname = %version
%description -n libkmod-devel %description -n libkmod-devel
@ -80,13 +80,10 @@ list modules, also checking its properties, dependencies and aliases.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1
%build %build
%if 0%{?git_snapshot} autoreconf -fi;
if [ ! -e configure ]; then
autoreconf -fi;
fi;
%endif
# 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 --with-xz --with-zlib --includedir=%_includedir/%name-%version \ %configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
@ -117,10 +114,11 @@ make check
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/bin/kmod /bin/kmod
%_mandir/man5/modules.dep.bin.5*
%files -n %lname %files -n %lname
%defattr(-,root,root) %defattr(-,root,root)
/%_lib/libkmod.so.1* /%_lib/libkmod-5.so
%files -n libkmod-devel %files -n libkmod-devel
%defattr(-,root,root) %defattr(-,root,root)