version 5

This commit is contained in:
Kay Sievers 2012-02-07 01:48:43 +01:00
parent 706525306b
commit d398533b87
3 changed files with 29 additions and 38 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/kmod-4.tar.xz /kmod-5.tar.xz

View File

@ -1,5 +1,5 @@
Name: kmod Name: kmod
Version: 4 Version: 5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Linux kernel module management utilities Summary: Linux kernel module management utilities
@ -17,9 +17,9 @@ BuildRequires: chrpath
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: xz-devel BuildRequires: xz-devel
#Provides: module-init-tools = 4.0-1 Provides: module-init-tools = 4.0-1
#Obsoletes: module-init-tools < 4.0-1 Obsoletes: module-init-tools < 4.0-1
#Provides: /sbin/modprobe Provides: /sbin/modprobe
%description %description
The kmod package provides various programs needed for automatic The kmod package provides various programs needed for automatic
@ -49,39 +49,25 @@ applications that wish to load or unload Linux kernel modules.
%setup -q %setup -q
%build %build
# Install into /bin, /lib* for now. This will move into /usr as part of
# the planned changes to filesystem layout soon.
%configure \ %configure \
--bindir=/bin \
--with-rootprefix= \
--with-rootlibdir=/%{_lib} \
--with-zlib \ --with-zlib \
--with-xz --with-xz
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# TODO: Fix the upstream rpath issues to avoid doing this (just for now)
chrpath --delete $RPM_BUILD_ROOT/bin/kmod
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
#mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT%{_sbindir}
#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/modprobe ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modprobe
#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/modinfo ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modinfo
#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/insmod ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/insmod
#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/rmmod ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/rmmod
#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/depmod ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/depmod
rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/*.5*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/*.8*
mkdir -p $RPM_BUILD_ROOT/lib/modprobe.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
@ -91,26 +77,31 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_sysconfdir}/depmod.d %dir %{_sysconfdir}/depmod.d
%dir %{_sysconfdir}/modprobe.d %dir %{_sysconfdir}/modprobe.d
%dir /lib/modprobe.d %dir %{_prefix}/lib/modprobe.d
/bin/kmod %{_bindir}/kmod
#/sbin/modprobe %{_sbindir}/modprobe
#/sbin/modinfo %{_sbindir}/modinfo
#/sbin/insmod %{_sbindir}/insmod
#/sbin/rmmod %{_sbindir}/rmmod
#/sbin/depmod %{_sbindir}/depmod
#%attr(0644,root,root) %{_mandir}/man5/*.5* %attr(0644,root,root) %{_mandir}/man5/*.5*
#%attr(0644,root,root) %{_mandir}/man8/*.8* %attr(0644,root,root) %{_mandir}/man8/*.8*
%doc NEWS README TODO COPYING %doc NEWS README TODO COPYING
%files libs %files libs
/%{_lib}/libkmod.so* %{_libdir}/libkmod.so.*
%files devel %files devel
%{_includedir}/libkmod.h %{_includedir}/libkmod.h
%{_libdir}/pkgconfig/libkmod.pc %{_libdir}/pkgconfig/libkmod.pc
/%{_libdir}/libkmod.so* %{_libdir}/libkmod.so
%changelog %changelog
* Tue Feb 7 2012 Kay Sievers <kay@redhat.com>
- Update to version 5
- replace the module-init-tools package and provide all tools
as compatibility symlinks
* Mon Jan 16 2012 Kay Sievers <kay@redhat.com> * Mon Jan 16 2012 Kay Sievers <kay@redhat.com>
- Update to version 4 - Update to version 4
- set --with-rootprefix= - set --with-rootprefix=

View File

@ -1 +1 @@
e14450a066a48accd0af1995b3c0232d kmod-4.tar.xz b271c2ec54aba1c67bda63c8579d8c15 kmod-5.tar.xz