mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-01 18:42:22 +02:00
Upgraded the pciutils Portage package
Upgraded sys-apps/pciutils to version 3.1.9-r1 on amd64 BUG=chromium-os:29910 TEST=run in chroot % USE="static static-libs" emerge-x86-alex flashrom Change-Id: I1a5065be0938ad964ac5c6319fe50fa164970708 Reviewed-on: https://gerrit.chromium.org/gerrit/21017 Reviewed-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com> Tested-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com> Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Louis Yung-Chieh Lo
Gerrit
parent
77aa61b056
commit
298a77fc6f
@ -1,12 +1,14 @@
|
||||
DEFINED_PHASES=compile install postinst unpack
|
||||
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=network-cron zlib
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
|
||||
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.4.tar.gz
|
||||
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_=ee72dac39787a0c081e0884ca3264aeb
|
||||
_md5_=d433531b6415cb03d9211ad157fe30e3
|
||||
@ -1 +1 @@
|
||||
DIST pciutils-3.1.4.tar.gz 305747 RMD160 86ed925d1345e8050aa990ce212fff114e569111 SHA1 eafde87ac5bb3f0bcabc98461f22a23f8e7229f2 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20
|
||||
DIST pciutils-3.1.9.tar.gz 340215 RMD160 536d2a05477eb242d434a96995b5e22e9d2f90a6 SHA1 6b0fc73ec0fe6a4fa4acb7dab13f3a83f3a45098 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178
|
||||
|
||||
11
sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
vendored
Normal file
11
sdk_container/src/third_party/portage-stable/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- pciutils-3.1.7/lib/configure
|
||||
+++ pciutils-3.1.7/lib/configure
|
||||
@@ -85,7 +85,7 @@
|
||||
esac
|
||||
echo >>$c '#define PCI_HAVE_STDINT_H'
|
||||
;;
|
||||
- freebsd)
|
||||
+ freebsd*)
|
||||
echo_n " fbsd-device"
|
||||
echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
|
||||
echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
|
||||
@ -0,0 +1,41 @@
|
||||
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,6 +90,13 @@
|
||||
|
||||
distclean: clean
|
||||
|
||||
+install-pcilib: lib/$(PCILIB)
|
||||
+ $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
|
||||
+ $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
|
||||
+
|
||||
+ifeq ($(SHARED),yes)
|
||||
+install: install-pcilib
|
||||
+endif
|
||||
install: all
|
||||
# -c is ignored on Linux, but required on FreeBSD
|
||||
$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
|
||||
@@ -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
|
||||
@ -0,0 +1,13 @@
|
||||
make sure all lib entries get into libs.private in the .pc file
|
||||
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
|
||||
-e 's,@LIBDIR@,$(LIBDIR),' \
|
||||
-e 's,@IDSDIR@,$(IDSDIR),' \
|
||||
-e 's,@VERSION@,$(VERSION),' \
|
||||
- -e 's,@LDLIBS@,$(LDLIBS),'
|
||||
+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
|
||||
|
||||
init.o: init.c $(INCL)
|
||||
access.o: access.c $(INCL)
|
||||
@ -1,69 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.4.ebuild,v 1.12 2010/01/30 18:36:57 armin76 Exp $
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Various utilities dealing with the PCI bus"
|
||||
HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
|
||||
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"
|
||||
IUSE="network-cron zlib"
|
||||
|
||||
DEPEND="zlib? ( sys-libs/zlib )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${P}-install-lib.patch #273489
|
||||
epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
|
||||
sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
|
||||
}
|
||||
|
||||
uyesno() { use $1 && echo yes || echo no ; }
|
||||
pemake() {
|
||||
emake \
|
||||
HOST="${CHOST}" \
|
||||
CROSS_COMPILE="${CHOST}-" \
|
||||
CC="$(tc-getCC)" \
|
||||
DNS="yes" \
|
||||
IDSDIR="/usr/share/misc" \
|
||||
MANDIR="/usr/share/man" \
|
||||
PREFIX="/usr" \
|
||||
SHARED="yes" \
|
||||
STRIP="" \
|
||||
ZLIB=$(uyesno zlib) \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pemake OPT="${CFLAGS}" all || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pemake DESTDIR="${D}" install install-lib || die
|
||||
dodoc ChangeLog README TODO
|
||||
|
||||
if use network-cron ; then
|
||||
exeinto /etc/cron.monthly
|
||||
newexe "${FILESDIR}"/pciutils.cron update-pciids \
|
||||
|| die "Failed to install update cronjob"
|
||||
fi
|
||||
|
||||
# Install both forms until HAL has migrated
|
||||
if use zlib ; then
|
||||
local sharedir="${D}/usr/share/misc"
|
||||
elog "Providing a backwards compatibility non-compressed pci.ids"
|
||||
gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/init.d-pciparm pciparm
|
||||
newconfd "${FILESDIR}"/conf.d-pciparm pciparm
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The 'pcimodules' program has been replaced by 'lspci -k'"
|
||||
}
|
||||
77
sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
vendored
Normal file
77
sdk_container/src/third_party/portage-stable/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
vendored
Normal file
@ -0,0 +1,77 @@
|
||||
# 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 $
|
||||
|
||||
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"
|
||||
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 )"
|
||||
|
||||
DEPEND="zlib? ( sys-libs/zlib )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
|
||||
epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
|
||||
epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
|
||||
|
||||
if use static-libs ; then
|
||||
cp -pPR "${S}" "${S}.static" || die
|
||||
fi
|
||||
}
|
||||
|
||||
pemake() {
|
||||
emake \
|
||||
HOST="${CHOST}" \
|
||||
CROSS_COMPILE="${CHOST}-" \
|
||||
CC="$(tc-getCC)" \
|
||||
DNS="yes" \
|
||||
IDSDIR='$(SHAREDIR)/misc' \
|
||||
MANDIR='$(SHAREDIR)/man' \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
SHARED="yes" \
|
||||
STRIP="" \
|
||||
ZLIB=$(usex zlib) \
|
||||
PCI_COMPRESSED_IDS=$(usex compress-db 1 0) \
|
||||
PCI_IDS=$(usex compress-db pci.ids{.gz,}) \
|
||||
LIBDIR="\${PREFIX}/$(get_libdir)" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pemake OPT="${CFLAGS}" all
|
||||
if use static-libs ; then
|
||||
pemake \
|
||||
-C "${S}.static" \
|
||||
OPT="${CFLAGS}" \
|
||||
SHARED="no" \
|
||||
lib/libpci.a
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pemake DESTDIR="${D}" install install-lib
|
||||
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
|
||||
|
||||
newinitd "${FILESDIR}"/init.d-pciparm pciparm
|
||||
newconfd "${FILESDIR}"/conf.d-pciparm pciparm
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The 'pcimodules' program has been replaced by 'lspci -k'"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user