From 015c7fa12a26a0a5ed23b0b5d2c17507ad2241c64205fc7c18663c51d43834b3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 20 Jan 2012 18:20:51 +0000 Subject: [PATCH 1/4] kmod 4 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=13 --- kmod-3.tar.xz | 3 --- kmod-4.tar.xz | 3 +++ kmod.changes | 7 +++++++ kmod.spec | 21 ++++++++++++++++++--- 4 files changed, 28 insertions(+), 6 deletions(-) delete mode 100644 kmod-3.tar.xz create mode 100644 kmod-4.tar.xz diff --git a/kmod-3.tar.xz b/kmod-3.tar.xz deleted file mode 100644 index a6529ec..0000000 --- a/kmod-3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9 -size 285512 diff --git a/kmod-4.tar.xz b/kmod-4.tar.xz new file mode 100644 index 0000000..9e68c7c --- /dev/null +++ b/kmod-4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bcae464d1801f403e6c6454b922c4b117f61cb8cf1a85a3a24267fbf353ff68 +size 325304 diff --git a/kmod.changes b/kmod.changes index d02a474..6d05d25 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 20 18:13:50 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 4 +* new APIs in libkmod: blacklists, install/remove commands, + aliases, options, softdeps and dumping indexes + ------------------------------------------------------------------- Fri Jan 6 00:48:41 UTC 2012 - jengelh@medozas.de diff --git a/kmod.spec b/kmod.spec index 9405402..1155d1b 100644 --- a/kmod.spec +++ b/kmod.spec @@ -20,7 +20,7 @@ Name: kmod %define lname libkmod1 Summary: Utilities to load modules into the kernel -Version: 3 +Version: 4 Release: 0 %define git_snapshot 0 License: LGPL-2.1+ and GPL-2.0+ @@ -34,7 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?git_snapshot} BuildRequires: autoconf automake libtool %endif -BuildRequires: pkgconfig >= 0.23 pkgconfig(liblzma) pkgconfig(zlib) xz +BuildRequires: pkgconfig >= 0.23 pkgconfig(liblzma) >= 4.99 +BuildRequires: pkgconfig(zlib) xz %description kmod is a set of tools to handle common tasks with Linux kernel @@ -130,6 +131,20 @@ make check %files compat %defattr(-,root,root) /bin/lsmod -/sbin/* +/sbin/depmod +/sbin/insmod +/sbin/lsmod +/sbin/modinfo +/sbin/modprobe +/sbin/rmmod +%_mandir/man5/depmod.d.5* +%_mandir/man5/modprobe.d.5* +%_mandir/man5/modules.dep.5* +%_mandir/man8/depmod.8* +%_mandir/man8/insmod.8* +%_mandir/man8/lsmod.8* +%_mandir/man8/modinfo.8* +%_mandir/man8/modprobe.8* +%_mandir/man8/rmmod.8* %changelog From b142ac7be3b5cb00a3e4bbe5598fd352500b1f84a67b5f897879677395ae2f15 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Feb 2012 00:59:10 +0000 Subject: [PATCH 2/4] kmod 5 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=14 --- kmod-4.tar.xz | 3 --- kmod-5.tar.sign | 17 +++++++++++++++++ kmod-5.tar.xz | 3 +++ kmod-so-version.diff | 32 ++++++++++++++++++++++++++++++++ kmod.changes | 8 ++++++++ kmod.spec | 34 ++++++++++++++++------------------ 6 files changed, 76 insertions(+), 21 deletions(-) delete mode 100644 kmod-4.tar.xz create mode 100644 kmod-5.tar.sign create mode 100644 kmod-5.tar.xz create mode 100644 kmod-so-version.diff diff --git a/kmod-4.tar.xz b/kmod-4.tar.xz deleted file mode 100644 index 9e68c7c..0000000 --- a/kmod-4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bcae464d1801f403e6c6454b922c4b117f61cb8cf1a85a3a24267fbf353ff68 -size 325304 diff --git a/kmod-5.tar.sign b/kmod-5.tar.sign new file mode 100644 index 0000000..4722811 --- /dev/null +++ b/kmod-5.tar.sign @@ -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----- diff --git a/kmod-5.tar.xz b/kmod-5.tar.xz new file mode 100644 index 0000000..ca0ae3a --- /dev/null +++ b/kmod-5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cb014f9f95575f1bc4b1f9babb6199a9b8c37fb1b38dc4340a2bcf230e66086 +size 875556 diff --git a/kmod-so-version.diff b/kmod-so-version.diff new file mode 100644 index 0000000..5f51faa --- /dev/null +++ b/kmod-so-version.diff @@ -0,0 +1,32 @@ + +kmod broke versioning starting with kmod v5. + +References: +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: diff --git a/kmod.changes b/kmod.changes index 6d05d25..7b3d81d 100644 --- a/kmod.changes +++ b/kmod.changes @@ -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 diff --git a/kmod.spec b/kmod.spec index 1155d1b..e3e3ed7 100644 --- a/kmod.spec +++ b/kmod.spec @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: kmod -%define lname libkmod1 +%define lname libkmod-5 Summary: Utilities to load modules into the kernel -Version: 4 -Release: 0 -%define git_snapshot 0 License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel +Version: 5 +Release: 0 Url: http://www.politreco.com/2011/12/announce-kmod-2/ #Git-Clone: git://git.profusion.mobi/kmod Source: %name-%version.tar.xz +Patch1: kmod-so-version.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?git_snapshot} -BuildRequires: autoconf automake libtool -%endif -BuildRequires: pkgconfig >= 0.23 pkgconfig(liblzma) >= 4.99 -BuildRequires: pkgconfig(zlib) xz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig >= 0.23 +BuildRequires: xz +BuildRequires: pkgconfig(liblzma) >= 4.99 +BuildRequires: pkgconfig(zlib) %description 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 Summary: Development files for libkmod -Group: Development/Libraries/C and C++ License: LGPL-2.1+ +Group: Development/Libraries/C and C++ Requires: %lname = %version %description -n libkmod-devel @@ -80,13 +80,10 @@ list modules, also checking its properties, dependencies and aliases. %prep %setup -q +%patch -P 1 -p1 %build -%if 0%{?git_snapshot} -if [ ! -e configure ]; then - autoreconf -fi; -fi; -%endif +autoreconf -fi; # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \ @@ -117,10 +114,11 @@ make check %files %defattr(-,root,root) /bin/kmod +%_mandir/man5/modules.dep.bin.5* %files -n %lname %defattr(-,root,root) -/%_lib/libkmod.so.1* +/%_lib/libkmod-5.so %files -n libkmod-devel %defattr(-,root,root) From 288d9ebf01f2f55b4216b155596ade06d4bd84446e73e162eec0b1c57e938ba0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 01:03:29 +0000 Subject: [PATCH 3/4] Include tarball signature OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=15 --- kmod.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kmod.spec b/kmod.spec index e3e3ed7..846dba7 100644 --- a/kmod.spec +++ b/kmod.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kmod %define lname libkmod-5 Summary: Utilities to load modules into the kernel @@ -26,6 +27,7 @@ Url: http://www.politreco.com/2011/12/announce-kmod-2/ #Git-Clone: git://git.profusion.mobi/kmod Source: %name-%version.tar.xz +Source: %name-%version.tar.sign Patch1: kmod-so-version.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build From 97f0901b06a1794fac3877a6a2d3eaadb9b5df691bc4577760148fa843b7b6ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 02:47:37 +0000 Subject: [PATCH 4/4] Redo patch to use -version-number instead OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=16 --- kmod-so-version.diff | 36 +++++++++++++++++++++--------------- kmod.spec | 11 +++++++---- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/kmod-so-version.diff b/kmod-so-version.diff index 5f51faa..8a53409 100644 --- a/kmod-so-version.diff +++ b/kmod-so-version.diff @@ -1,32 +1,38 @@ -kmod broke versioning starting with kmod v5. +Change the kmod Makefile from using -version-info to -version-number +to make it clear that the kmod project is not trying to subvert the +libtool "interface" number concept, but in fact does not do +libtool-style counting. References: -References: http://article.gmane.org/gmane.linux.kernel.modules/705 +References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html --- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile.am | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) Index: kmod-5/Makefile.am =================================================================== --- kmod-5.orig/Makefile.am +++ kmod-5/Makefile.am -@@ -71,7 +71,7 @@ EXTRA_DIST += libkmod/libkmod.sym +@@ -39,9 +39,8 @@ SED_PROCESS = \ + %.pc: %.pc.in Makefile + $(SED_PROCESS) + +-LIBKMOD_CURRENT=2 +-LIBKMOD_REVISION=0 +-LIBKMOD_AGE=0 ++LIBKMOD_SO_MAJOR=2 ++LIBKMOD_SO_MINOR=0 + + noinst_LTLIBRARIES = libkmod/libkmod-util.la + libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \ +@@ -71,7 +70,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} \ ++ -version-number ${LIBKMOD_SO_MAJOR}:${LIBKMOD_SO_MINOR} \ -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: diff --git a/kmod.spec b/kmod.spec index 846dba7..8e1c3e4 100644 --- a/kmod.spec +++ b/kmod.spec @@ -17,7 +17,7 @@ Name: kmod -%define lname libkmod-5 +%define lname libkmod2 Summary: Utilities to load modules into the kernel License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel @@ -27,7 +27,7 @@ Url: http://www.politreco.com/2011/12/announce-kmod-2/ #Git-Clone: git://git.profusion.mobi/kmod Source: %name-%version.tar.xz -Source: %name-%version.tar.sign +Source2: %name-%version.tar.sign Patch1: kmod-so-version.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +80,9 @@ Requires: %lname = %version libkmod was created to allow programs to easily insert, remove and list modules, also checking its properties, dependencies and aliases. +This package contains the development headers for the library found +in %lname. + %prep %setup -q %patch -P 1 -p1 @@ -120,12 +123,12 @@ make check %files -n %lname %defattr(-,root,root) -/%_lib/libkmod-5.so +/%_lib/libkmod.so.2* %files -n libkmod-devel %defattr(-,root,root) %_includedir/* -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/libkmod.pc %_libdir/libkmod.so %files compat