From d577e2988a40153a0a40b24c28bce98e467349fb Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Mon, 22 Oct 2012 16:08:40 -0700 Subject: [PATCH] Upgrade the pciutils Portage package. Upgrade sys-apps/pciutils to version 3.1.10 on amd64 BUG=chrome-os-partner:11327 BUG=chromium-os:33226 TEST=manual, build image + test lsusb / lspci Change-Id: I5021b5e0d896f411f7e1a6910e893153efab7f04 Reviewed-on: https://gerrit.chromium.org/gerrit/36279 Reviewed-by: Mike Frysinger Tested-by: Shawn Nematbakhsh Commit-Ready: Shawn Nematbakhsh --- .../md5-cache/sys-apps/pciutils-3.1.10 | 13 ++++++ .../md5-cache/sys-apps/pciutils-3.1.9-r1 | 14 ------- .../portage-stable/sys-apps/pciutils/Manifest | 2 +- ...utils-2.2.7-update-pciids-both-forms.patch | 22 ---------- .../files/pciutils-3.1.4-install-lib.patch | 40 ------------------- .../sys-apps/pciutils/files/pciutils.cron | 2 - ...3.1.9-r1.ebuild => pciutils-3.1.10.ebuild} | 31 ++++++++------ 7 files changed, 32 insertions(+), 92 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.10 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch delete mode 100755 sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils.cron rename sdk_container/src/third_party/portage-stable/sys-apps/pciutils/{pciutils-3.1.9-r1.ebuild => pciutils-3.1.10.ebuild} (60%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.10 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.10 new file mode 100644 index 0000000000..e1c33dd1ba --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare +DEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) +DESCRIPTION=Various utilities dealing with the PCI bus +EAPI=4 +HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git +IUSE=static-libs zlib +KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) sys-apps/hwids +SLOT=0 +SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.10.tar.gz +_eclasses_=eutils 5a98daf52f7430a4a6f46cee24cfe3e2 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=38a1de6c4ad9d220aa75e187cf7b9fa0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1 deleted file mode 100644 index e0f6c7c784..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install postinst prepare -DEPEND=zlib? ( sys-libs/zlib ) -DESCRIPTION=Various utilities dealing with the PCI bus -EAPI=4 -HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html -IUSE=compress-db network-cron static-libs zlib -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=zlib? ( sys-libs/zlib ) -REQUIRED_USE=compress-db? ( zlib ) -SLOT=0 -SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.9.tar.gz -_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d433531b6415cb03d9211ad157fe30e3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/Manifest index a413230f91..04848dc9b6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/Manifest @@ -1 +1 @@ -DIST pciutils-3.1.9.tar.gz 340215 RMD160 536d2a05477eb242d434a96995b5e22e9d2f90a6 SHA1 6b0fc73ec0fe6a4fa4acb7dab13f3a83f3a45098 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178 +DIST pciutils-3.1.10.tar.gz 345149 RMD160 e22ad4b49b077c210c5bdb8ee8e0373fc72d11de SHA1 01eed212edfa5bbfedcf86d177ae2df4a4007d61 SHA256 7ca8201f806cbad31cb86bcbb2c2c99853cc05618b360eb58bde31a0f8d1f2a3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch deleted file mode 100644 index 855026be4c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pciutils-2.2.7/update-pciids.sh -+++ pciutils-2.2.7/update-pciids.sh -@@ -72,4 +72,19 @@ - rm -f ${DEST%.gz} ${DEST%.gz}.old - fi - -+# if the gzip version exists, but we are not using compressed mode, -+# erase the gzip version, as it is old and crufty -+if [ -z "$PCI_COMPRESSED_IDS" ] && [ -f $DEST.gz ]; then -+ rm -f ${DEST}.gz -+fi -+ -+# Lastly, because HAL still reads the plaintext version only and -+# has not yet migrated to using a library we leave the plaintext -+# version in addition to the gzip version. -+# They need to migrate because the pci.ids format will be changing. -+if [ ${DEST%.gz} != ${DEST} ] ; then -+ gzip -d <${DEST} >${DEST%.gz} -+fi -+chmod a+r ${DEST} ${DEST%.gz} -+ - ${quiet} || echo "Done." diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch deleted file mode 100644 index 3358b01b85..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch +++ /dev/null @@ -1,40 +0,0 @@ -don't have the install and install-lib targets install the same files -otherwise we can hit parallel install failures - -http://bugs.gentoo.org/273489 - -patch by Kevin Pyle - ---- Makefile -+++ Makefile -@@ -90,7 +90,11 @@ - - distclean: clean - --install: all -+install-pcilib: lib/$(PCILIB) -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) -+ -+install: all install-pcilib - # -c is ignored on Linux, but required on FreeBSD - $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 - $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) -@@ -99,15 +103,12 @@ - $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 - $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 - ifeq ($(SHARED),yes) -- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) -- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) - ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION) - endif - --install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC) -- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR) -+install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR) - $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci -- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) - $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) - ifeq ($(SHARED),yes) - ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils.cron b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils.cron deleted file mode 100755 index 4c69423652..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/sbin/update-pciids -q diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.10.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.10.ebuild index 47c551323f..a2ce476baa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.10.ebuild @@ -1,23 +1,27 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild,v 1.9 2012/04/24 14:43:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.10.ebuild,v 1.3 2012/10/02 12:55:22 blueness Exp $ EAPI="4" inherit eutils multilib toolchain-funcs DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" +HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git" SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="compress-db network-cron static-libs zlib" -REQUIRED_USE="compress-db? ( zlib )" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="static-libs zlib" -DEPEND="zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" +# Have the sub-libs in RDEPEND with [static-libs] since, logically, +# our libssl.a depends on libz.a/etc... at runtime. +LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )" +DEPEND="static-libs? ( ${LIB_DEPEND} ) + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" +RDEPEND="${DEPEND} + sys-apps/hwids" src_prepare() { epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489 @@ -41,8 +45,8 @@ pemake() { SHARED="yes" \ STRIP="" \ ZLIB=$(usex zlib) \ - PCI_COMPRESSED_IDS=$(usex compress-db 1 0) \ - PCI_IDS=$(usex compress-db pci.ids{.gz,}) \ + PCI_COMPRESSED_IDS=0 \ + PCI_IDS=pci.ids \ LIBDIR="\${PREFIX}/$(get_libdir)" \ "$@" } @@ -63,10 +67,8 @@ src_install() { use static-libs && dolib.a "${S}.static/lib/libpci.a" dodoc ChangeLog README TODO - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/pciutils.cron update-pciids - fi + rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \ + "${ED}"/usr/share/man/man8/update-pciids.8* newinitd "${FILESDIR}"/init.d-pciparm pciparm newconfd "${FILESDIR}"/conf.d-pciparm pciparm @@ -74,4 +76,7 @@ src_install() { pkg_postinst() { elog "The 'pcimodules' program has been replaced by 'lspci -k'" + elog "" + elog "The 'network-cron' USE flag is gone; if you want a more up-to-date" + elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)." }