diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-12-19 11:19:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-19 11:19:39 +0000 |
| commit | 096b2d758d575674f62c8393787e7feba3f9a984 (patch) | |
| tree | 138e7aeaff1468e1fb2adc30dbbfb0921179de73 | |
| parent | Clean up some deprecated atoms, wrt bug #444181 (diff) | |
| download | gentoo-2-096b2d758d575674f62c8393787e7feba3f9a984.tar.gz gentoo-2-096b2d758d575674f62c8393787e7feba3f9a984.tar.bz2 gentoo-2-096b2d758d575674f62c8393787e7feba3f9a984.zip | |
Install usb-load-ehci-first.conf from sys-apps/kmod instead of shipping duplicate copy here wrt #442384
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
| -rw-r--r-- | sys-kernel/mkinitcpio/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch | 13 | ||||
| -rw-r--r-- | sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild | 12 |
3 files changed, 19 insertions, 13 deletions
diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog index 3582d9d0d300..bf0e63155ab0 100644 --- a/sys-kernel/mkinitcpio/ChangeLog +++ b/sys-kernel/mkinitcpio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/mkinitcpio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.9 2012/12/03 02:13:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.10 2012/12/19 11:19:38 ssuominen Exp $ + + 19 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> + mkinitcpio-0.9.2-r1.ebuild, files/mkinitcpio-base-install.patch: + Install usb-load-ehci-first.conf from sys-apps/kmod instead of shipping + duplicate copy here wrt #442384 03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> mkinitcpio-0.9.2-r1.ebuild: diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch index 35459f65980b..9e7edda9e2a0 100644 --- a/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch +++ b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch @@ -1,5 +1,5 @@ ---- mkinitcpio-0.9.2-r1/install/base -+++ mkinitcpio-0.9.2-r1/install/base +--- mkinitcpio-0.9.2/install/base ++++ mkinitcpio-0.9.2/install/base @@ -12,9 +12,9 @@ add_symlink /bin usr/bin add_symlink /usr/sbin bin @@ -12,3 +12,12 @@ add_symlink "/usr/bin/$applet" busybox done +@@ -35,7 +35,7 @@ + + add_file "/usr/lib/initcpio/init_functions" "/init_functions" + add_file "/usr/lib/initcpio/init" "/init" +- add_file "/usr/lib/modprobe.d/usb-load-ehci-first.conf" ++ add_file "/lib/modprobe.d/usb-load-ehci-first.conf" + } + + help() { diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild index f17bce6929ee..5b214b4800c6 100644 --- a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild +++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.6 2012/12/03 02:13:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.7 2012/12/19 11:19:38 ssuominen Exp $ EAPI=4 @@ -27,7 +27,7 @@ RDEPEND="app-arch/cpio sys-apps/file sys-apps/findutils sys-apps/grep - >=sys-apps/kmod-7 + >=sys-apps/kmod-12-r1 >=sys-apps/util-linux-2.21 udev? ( >virtual/udev-171 ) device-mapper? ( sys-fs/lvm2[static] ) @@ -97,14 +97,6 @@ src_install() { sed -e "s/KV/${KV_FULL}/g" \ "${FILESDIR}"/gentoo.preset \ > "${D}"/etc/mkinitcpio.d/${KV_FULL}.preset || die - - # This file doesn't belong to this package because it's already - # being installed by the module loader packages kmod and m-i-t. - # If this needs to be copied into the initramfs itself, the version - # from kmod or m-i-t can be used'so this should never be useful here. - # Comment out for now wrt bug #442384, -ssuominen 2012/12 - #insinto /usr/lib/modprobe.d - #doins "${FILESDIR}/usb-load-ehci-first.conf" } pkg_postinst() { |