From 70511b7e50cc5e25961ecb2606ed84b7ed5c539c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 8 Aug 2013 10:07:36 +0200 Subject: [PATCH] base-files: update usb-load-ehci-first for recent kmod; install it to /usr/lib/modprobe.d. --- srcpkgs/base-files/files/usb-load-ehci-first | 7 ++----- srcpkgs/base-files/template | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/base-files/files/usb-load-ehci-first b/srcpkgs/base-files/files/usb-load-ehci-first index f90d5532685..94737941139 100644 --- a/srcpkgs/base-files/files/usb-load-ehci-first +++ b/srcpkgs/base-files/files/usb-load-ehci-first @@ -1,5 +1,2 @@ -# -# Load the EHCI driver before OHCI or UHCI, to avoid a warning. -# -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS +softdep ohci_hcd pre: ehci_hcd +softdep uhci_hcd pre: ehci_hcd diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 6def28b035c..8ae825fce90 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,6 +1,6 @@ # Template file for 'base-files' pkgname=base-files -version=0.88 +version=0.89 revision=1 bootstrap=yes makedepends="base-directories xbps-triggers" @@ -24,7 +24,7 @@ do_install() { install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc - vinstall ${FILESDIR}/usb-load-ehci-first 644 etc/modprobe.d \ + vinstall ${FILESDIR}/usb-load-ehci-first 644 usr/lib/modprobe.d \ usb-load-ehci-first.conf vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d