kmod: update to latest upstream (version 3)

This commit is contained in:
Jon Masters 2012-01-05 07:36:46 -05:00
parent 2de6dace27
commit 9136f12e36
3 changed files with 22 additions and 15 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/kmod-2.tar.xz
/kmod-3.tar.xz

View File

@ -1,6 +1,6 @@
Name: kmod
Version: 2
Release: 6%{?dist}
Version: 3
Release: 1%{?dist}
Summary: Linux kernel module management utilities
Group: System Environment/Kernel
@ -10,7 +10,6 @@ License: GPLv2+
URL: http://git.profusion.mobi/cgit.cgi/kmod.git/
#TODO: The following URL will be moving to kernel.org eventually
Source0: http://packages.profusion.mobi/kmod/%{name}-%{version}.tar.xz
Patch0: kmod-2-with-rootlibdir.patch
Exclusiveos: Linux
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -49,7 +48,6 @@ applications that wish to load or unload Linux kernel modules.
%prep
%setup -q
%patch0 -p1 -b .rootlibdir
%build
@ -67,11 +65,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
# TODO: Fix the upstream rpath issues to avoid doing this (just for now)
chrpath --delete $RPM_BUILD_ROOT/bin/kmod-insmod
chrpath --delete $RPM_BUILD_ROOT/bin/kmod-lsmod
chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modinfo
chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modprobe
chrpath --delete $RPM_BUILD_ROOT/bin/kmod-rmmod
chrpath --delete $RPM_BUILD_ROOT/bin/kmod
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-depmod
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-insmod
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-lsmod
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modinfo
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modprobe
#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-rmmod
mkdir -p $RPM_BUILD_ROOT/etc
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
@ -100,11 +100,13 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/modprobe.d
# NOTE: always /lib even on systems with /lib64 (there is no macro available)
%dir /lib/modprobe.d
/bin/kmod-insmod
/bin/kmod-lsmod
/bin/kmod-modinfo
/bin/kmod-modprobe
/bin/kmod-rmmod
/bin/kmod
#/bin/kmod-depmod
#/bin/kmod-insmod
#/bin/kmod-lsmod
#/bin/kmod-modinfo
#/bin/kmod-modprobe
#/bin/kmod-rmmod
%doc NEWS README TODO COPYING
%files libs
@ -116,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
/%{_libdir}/libkmod.so*
%changelog
* Thu Jan 05 2012 Jon Masters <jcm@jonmasters.org> - 3-1
- Update to latest upstream (adds new depmod replacement utility)
- For the moment, use the "kmod" utility to test the various functions
* Fri Dec 23 2011 Jon Masters <jcm@jonmasters.org> - 2-6
- Update kmod-2-with-rootlibdir patch with rebuild automake files

View File

@ -1 +1 @@
6017364434377f6724f749d7a28c5d7a kmod-2.tar.xz
bc0e69f75c2ac22c091f05e166e86c5d kmod-3.tar.xz