Install /etc/modprobe.d/usb-load-ehci-first.conf that will ensure ehci is loaded before uhci or ohci wrt #260139. Thanks to Szymon Zygmunt, Martin Mokrejš, Pacho Ramos and Mike Frysinger.

Package-Manager: portage-2.2_rc69/cvs/Linux x86_64

3 files changed, 108 insertions, 12 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 3368d0b53472..d1a77c1fcadf 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.159 2010/08/06 05:56:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.160 2010/09/04 10:43:02 ssuominen Exp $
+
+*module-init-tools-3.12-r1 (04 Sep 2010)
+
+  04 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +module-init-tools-3.12-r1.ebuild:
+  Install /etc/modprobe.d/usb-load-ehci-first.conf that will ensure ehci is
+  loaded before uhci or ohci wrt #260139. Thanks to Szymon Zygmunt, Martin
+  Mokrejš, Pacho Ramos and Mike Frysinger.
 
   06 Aug 2010; Mike Frysinger <vapier@gentoo.org> module-init-tools-3.5.ebuild,
   module-init-tools-3.6-r1.ebuild, module-init-tools-3.8.ebuild,
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 85801e86d7d5..61a9470aed53 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 RMD160 28491f1c5a654b21b4d82c2a23b8d0f30ea32960 SHA1 73a8deeb2765a31c0f51042a8ae69e7b3752e8de SHA256 8735f921aadd901b98983ce9678d3e7babb9fd3553ce7881460c050dc5611f66
 AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 RMD160 12e3132824dadbf853228dec146347cf2b87f31c SHA1 b2b16636ae61de179d4674dbe5c48868aa1e2ca0 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166
 AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 SHA1 5138c1a5b7ead76d683d5d3f31d7c161b0a4dfb2 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6
@@ -28,17 +25,11 @@ DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634
 EBUILD module-init-tools-3.10.ebuild 1402 RMD160 b1c0c68f197df9e119f7d863c38e59fd396c42a8 SHA1 0eebfb4260c4100f20bb61003fa01830a609a72b SHA256 e80629a3b7dd0a6b0764479069f9148d2b7c09e3ebfab3930e1f9a73e7625f5e
 EBUILD module-init-tools-3.11.1.ebuild 2635 RMD160 ba16b0b800fbc5c36eec0180c8479cb4f0504c5d SHA1 e3d15ac6b7357cd06723d746bfe081daaaaeeb52 SHA256 71c73ef099d11e8465bce02430e0925e609a103d10e1a130f77b3652c1d39fd1
 EBUILD module-init-tools-3.11.ebuild 1497 RMD160 cb3172e88961a434b7a9cbef9c01f49b1f385ec4 SHA1 4d3fa034fb6cf9d45d84057d6a65595ef2eed8dc SHA256 a7904a4ec9d943935ef9dbfc7a93775f51257a265f4929e1f8d87cacb0d09c6c
+EBUILD module-init-tools-3.12-r1.ebuild 2873 RMD160 6bafb5afcbe2cdf6098d2cbb3bf840a22120453a SHA1 c5499467c781cb42c7634e2f6a39015fdf86d49f SHA256 02d0f2d53b41098e3b340e16b650a0c9173bd6a07a899d226cea6b839c41fc0e
 EBUILD module-init-tools-3.12.ebuild 2535 RMD160 af142a2a5d3c397d28270d6758ae71881860655d SHA1 0d1015c9dced0fc003f9a4bb2b7effb82a074953 SHA256 9d2562b6c012a29e433d2f49ac5bcd9720e6b88ab31d0a816c3a397f6977be4d
 EBUILD module-init-tools-3.5.ebuild 5221 RMD160 eb103bfe87b453844417cea54dd894716934b4d2 SHA1 170e22c7438e967d7930a6c8da8a11b450d61bb7 SHA256 67e2b0eb9ca2775f5379407433913306072072c88839fcf2956f0a289d7851df
 EBUILD module-init-tools-3.6-r1.ebuild 5386 RMD160 88b549cf92a809d194fb379f30e8310cd34fbe9a SHA1 c88b0036a6f68b295cf67be1d505572274ce1095 SHA256 b2db2fc505f6a11957fe779a158aac2957e44b91c3cf9bdee16f12fcacaf1ec2
 EBUILD module-init-tools-3.8.ebuild 1566 RMD160 c78a9df38ef1348653055ef8b277fbbdbaf2e326 SHA1 47b4264c0d67565d93d6020486d56e355dd3d53d SHA256 39f63bddd0d5a8840c2060d7d914055bfca8bbb4260c4bee6baf4e61a75841a6
 EBUILD module-init-tools-3.9.ebuild 1401 RMD160 c1a4488bcd2f11b62cc55b243ce954ecdbc1b950 SHA1 783b5038149cf078a25f91ee0be5ffd72b62dfcb SHA256 42040b48986b4cbfd397e02924eb565a11ed500b408492ae77789de99bf1a6f3
-MISC ChangeLog 27791 RMD160 55c2beee23cca9f400e5efd3687950ad9495d935 SHA1 43ed42264a59e4288654de31dbc7151d8e9ab154 SHA256 22827a2f3400263191baba8331e0644e7245912178ed970bb0f1b86d461967c2
+MISC ChangeLog 28123 RMD160 084592ccb3851e1fff142e83799c74832a4ca4ce SHA1 9e26fb0363709bf9be9abc8f974989dbfd4f04c2 SHA256 92a3010ff95909a8f56c6ef07db5049782bb186038cdf42865861441f40b714a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkxbpCUACgkQTwhj9JtAlp7/+wEAmIU50eHM81CKHVLIBKXZNAX2
-BNLSqQa8LpxNoOnMomcA/i0AndctOlcFjloF1hD39fZnX/xNv4xN3NjMH3QXFxjy
-=b/Dq
------END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild
new file mode 100644
index 000000000000..d823044f0923
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild,v 1.1 2010/09/04 10:43:02 ssuominen Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="tools for managing linux kernel modules"
+HOMEPAGE="http://modules.wiki.kernel.org/"
+SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+DEPEND="sys-libs/zlib
+	>=sys-apps/baselayout-2.0.1
+	!virtual/modutils"
+PROVIDE="virtual/modutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	touch *.5 *.8 # dont regen manpages
+}
+
+src_compile() {
+	mkdir build && cd build #290207
+	use static && append-ldflags -static
+	ECONF_SOURCE=.. \
+	econf \
+		--prefix=/ \
+		--enable-zlib \
+		--enable-zlib-dynamic \
+		--disable-static-utils
+	emake || die
+}
+
+src_test() {
+	./tests/runtests || die
+}
+
+src_install() {
+	emake -C build install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	into /
+	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
+	doman "${FILESDIR}"/update-modules.8 || die
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	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
+	EOF
+
+	insinto /etc/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf || die #260139
+}
+
+pkg_postinst() {
+	# cheat to keep users happy
+	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
+		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
+	fi
+
+	# For files that were upgraded but not renamed via their ebuild to
+	# have a proper .conf extension, rename them so etc-update tools can
+	# take care of things. #274942
+	local i f cfg
+	eshopts_push -s nullglob
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		# The .conf files need no upgrading unless a non-.conf exists,
+		# so skip this until later ...
+		[[ ${f} == *.conf ]] && continue
+		# If a .conf doesn't exist, then a package needs updating, or
+		# the user created it, or it's orphaned.  Either way, we don't
+		# really know, so leave it alone.
+		[[ ! -f ${f}.conf ]] && continue
+
+		i=0
+		while :; do
+			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
+			[[ ! -e ${cfg} ]] && break
+			((i++))
+		done
+		elog "Updating ${f}; please run 'etc-update'"
+		mv "${f}.conf" "${cfg}"
+		mv "${f}" "${f}.conf"
+	done
+	# Whine about any non-.conf files that are left
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		[[ ${f} == *.conf ]] && continue
+		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
+		ewarn "Either upgrade the package that owns it, or manually rename it."
+	done
+	eshopts_pop
+}