From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OrqDC-0003LX-Tk for garchives@archives.gentoo.org; Sat, 04 Sep 2010 10:43:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 267ABE07CA; Sat, 4 Sep 2010 10:43:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D35CEE07CA for ; Sat, 4 Sep 2010 10:43:04 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41A311BC008 for ; Sat, 4 Sep 2010 10:43:04 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id C9D7B20051; Sat, 4 Sep 2010 10:43:02 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/module-init-tools: module-init-tools-3.12-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: module-init-tools-3.12-r1.ebuild ChangeLog X-VCS-Directories: sys-apps/module-init-tools X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20100904104302.C9D7B20051@flycatcher.gentoo.org> Date: Sat, 4 Sep 2010 10:43:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 39f83bdf-89ae-4e94-9637-96dafb922bb5 X-Archives-Hash: 7b911c1f9c2a1936debf01e100950ab0 ssuominen 10/09/04 10:43:02 Modified: ChangeLog Added: module-init-tools-3.12-r1.ebuild Log: 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, Mart= in Mokrej=C5=A1, Pacho Ramos and Mike Frysinger. =20 (Portage version: 2.2_rc69/cvs/Linux x86_64) Revision Changes Path 1.160 sys-apps/module-init-tools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/module-in= it-tools/ChangeLog?rev=3D1.160&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/module-in= it-tools/ChangeLog?rev=3D1.160&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/module-in= it-tools/ChangeLog?r1=3D1.159&r2=3D1.160 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- ChangeLog 6 Aug 2010 05:56:00 -0000 1.159 +++ ChangeLog 4 Sep 2010 10:43:02 -0000 1.160 @@ -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 + +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, Mart= in + Mokrej=C5=A1, Pacho Ramos and Mike Frysinger. =20 06 Aug 2010; Mike Frysinger module-init-tools-3.5.= ebuild, module-init-tools-3.6-r1.ebuild, module-init-tools-3.8.ebuild, 1.1 sys-apps/module-init-tools/module-init-tools-3.12-r1= .ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/module-in= it-tools/module-init-tools-3.12-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/module-in= it-tools/module-init-tools-3.12-r1.ebuild?rev=3D1.1&content-type=3Dtext/p= lain Index: module-init-tools-3.12-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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=3D"tools for managing linux kernel modules" HOMEPAGE=3D"http://modules.wiki.kernel.org/" SRC_URI=3D"mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.= bz2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~x86" IUSE=3D"static" DEPEND=3D"sys-libs/zlib >=3Dsys-apps/baselayout-2.0.1 !virtual/modutils" PROVIDE=3D"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=3D.. \ econf \ --prefix=3D/ \ --enable-zlib \ --enable-zlib-dynamic \ --disable-static-utils emake || die } src_test() { ./tests/runtests || die } src_install() { emake -C build install DESTDIR=3D"${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-insta= ll ohci_hcd \$CMDLINE_OPTS install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-insta= ll 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} =3D=3D *.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=3D0 while :; do cfg=3D$(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} =3D=3D *.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 }