Author: arekm Date: Tue Jan 17 12:22:35 2012 GMT Module: packages Tag: HEAD ---- Log message: - blacklist and usb configs like in module-init-tools
---- Files affected: packages/kmod: kmod.spec (1.6 -> 1.7) , kmod-blacklist (NONE -> 1.1) (NEW), kmod-usb (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kmod/kmod.spec diff -u packages/kmod/kmod.spec:1.6 packages/kmod/kmod.spec:1.7 --- packages/kmod/kmod.spec:1.6 Tue Jan 17 09:29:30 2012 +++ packages/kmod/kmod.spec Tue Jan 17 13:22:30 2012 @@ -8,6 +8,8 @@ Group: Applications/System Source0: http://packages.profusion.mobi/kmod/%{name}-%{version}.tar.xz # Source0-md5: e14450a066a48accd0af1995b3c0232d +Source1: %{name}-blacklist +Source2: %{name}-usb URL: http://git.profusion.mobi/cgit.cgi/kmod.git/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.11 @@ -71,6 +73,9 @@ %install rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/etc/modprobe.d + %{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT @@ -82,6 +87,11 @@ %{__rm} $RPM_BUILD_ROOT%{_libdir}/libkmod.la +:> $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf + +install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf +install %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/usb.conf + %clean rm -rf $RPM_BUILD_ROOT @@ -91,6 +101,11 @@ %files %defattr(644,root,root,755) %doc NEWS README TODO +%dir /etc/modprobe.d +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/blacklist.conf +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/modprobe.conf +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/usb.conf + %attr(755,root,root) %{_libdir}/libkmod.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libkmod.so.1 %attr(755,root,root) %{_sbindir}/kmod @@ -123,6 +138,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2012/01/17 12:22:30 arekm +- blacklist and usb configs like in module-init-tools + Revision 1.6 2012/01/17 08:29:30 arekm O: module-init-tools ================================================================ Index: packages/kmod/kmod-blacklist diff -u /dev/null packages/kmod/kmod-blacklist:1.1 --- /dev/null Tue Jan 17 13:22:35 2012 +++ packages/kmod/kmod-blacklist Tue Jan 17 13:22:30 2012 @@ -0,0 +1,4 @@ +## Put here any modules that should be blacklisted + +# evbug module shouldn't be loaded by default: +blacklist evbug ================================================================ Index: packages/kmod/kmod-usb diff -u /dev/null packages/kmod/kmod-usb:1.1 --- /dev/null Tue Jan 17 13:22:35 2012 +++ packages/kmod/kmod-usb Tue Jan 17 13:22:30 2012 @@ -0,0 +1,3 @@ +# kernel warns: ehci_hcd should always be loaded before uhci_hcd and ohci_hcd, not after +install uhci_hcd /sbin/modprobe ehci_hcd; /sbin/modprobe --ignore-install uhci_hcd +install ohci_hcd /sbin/modprobe ehci_hcd; /sbin/modprobe --ignore-install ohci_hcd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kmod/kmod.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
