diff --git a/kmod-2.tar.xz b/kmod-2.tar.xz deleted file mode 100644 index 3eb77fd..0000000 --- a/kmod-2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33edf14f28ef9b51d893e6167d846d23fc572f6ba634acf0ad9a6e3925ff55c0 -size 262484 diff --git a/kmod-3.tar.xz b/kmod-3.tar.xz new file mode 100644 index 0000000..a6529ec --- /dev/null +++ b/kmod-3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9 +size 285512 diff --git a/kmod.changes b/kmod.changes index 12677dd..d02a474 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Jan 6 00:48:41 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 3 +* new APIs in libkmod: get symbols from module, parsing the ELF + section, dependency symbols, insert module like modprobe +* support for Xz-compressed modules +* the depmod tool + +------------------------------------------------------------------- +Sat Dec 24 17:23:09 UTC 2011 - crrodriguez@opensuse.org + +- Use --enable-zlib and buildRequire zlib +- run make check + ------------------------------------------------------------------- Sun Dec 18 20:16:11 UTC 2011 - jengelh@medozas.de diff --git a/kmod.spec b/kmod.spec index 285cb50..9405402 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: kmod %define lname libkmod1 Summary: Utilities to load modules into the kernel -Version: 2 +Version: 3 Release: 0 +%define git_snapshot 0 License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -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 Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig, xz +%if 0%{?git_snapshot} +BuildRequires: autoconf automake libtool +%endif +BuildRequires: pkgconfig >= 0.23 pkgconfig(liblzma) pkgconfig(zlib) xz %description kmod is a set of tools to handle common tasks with Linux kernel @@ -39,9 +45,22 @@ These tools are designed on top of libkmod, a library that is shipped with kmod. The aim is to be compatible with tools, configurations and indexes from module-init-tools project. +%package compat +Summary: Compat symlinks for kernel module utilities +License: GPL-2.0+ +Group: System/Kernel +Conflicts: module-init-tools + +%description compat +kmod is a set of tools to handle common tasks with Linux kernel +modules like insert, remove, list, check properties, resolve +dependencies and aliases. + +This package contains traditional name symlinks (lsmod, etc.) + %package -n %lname Summary: Library to interact with Linux kernel modules -License: LGPL-2.1+ +License: LGPL-2.1+ Group: System/Libraries %description -n %lname @@ -51,7 +70,7 @@ 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+ +License: LGPL-2.1+ Requires: %lname = %version %description -n libkmod-devel @@ -62,14 +81,33 @@ list modules, also checking its properties, dependencies and aliases. %setup -q %build +%if 0%{?git_snapshot} +if [ ! -e configure ]; then + autoreconf -fi; +fi; +%endif # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. -%configure --includedir=%_includedir/%name-%version +%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \ + --with-rootlibdir=/%_lib --bindir=/bin make %{?_smp_mflags} %install +b="%buildroot"; %make_install -rm -f "%buildroot/%_libdir"/*.la +# Remove standalone tools +rm -f "$b/bin"/kmod-*; +rm -f "$b/%_libdir"/*.la; + +# kmod-compat +mkdir -p "$b/bin" "$b/sbin"; +ln -s kmod "$b/bin/lsmod"; +for i in depmod insmod lsmod modinfo modprobe rmmod; do + ln -s "/bin/kmod" "$b/sbin/$i"; +done; + +%check +make check %post -n %lname -p /sbin/ldconfig @@ -77,11 +115,11 @@ rm -f "%buildroot/%_libdir"/*.la %files %defattr(-,root,root) -%_bindir/kmod-* +/bin/kmod %files -n %lname %defattr(-,root,root) -%_libdir/libkmod.so.1* +/%_lib/libkmod.so.1* %files -n libkmod-devel %defattr(-,root,root) @@ -89,4 +127,9 @@ rm -f "%buildroot/%_libdir"/*.la %_libdir/pkgconfig/*.pc %_libdir/libkmod.so +%files compat +%defattr(-,root,root) +/bin/lsmod +/sbin/* + %changelog