aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Everitt <gentoo@veremit.xyz>2020-04-23 07:04:34 +0100
committerAnthony G. Basile <blueness@gentoo.org>2020-04-23 10:56:07 -0400
commit7a1f7e5a959c1eec0bf6d097b289f4201cf61150 (patch)
treee8c0210d9e76c639cbbf8f5412e89013a0a09cf1 /sys-apps
parentkeyutils: Fixed upstream in commit ab818a7, refactored in 0d71523. (diff)
downloadmusl-7a1f7e5a959c1eec0bf6d097b289f4201cf61150.tar.gz
musl-7a1f7e5a959c1eec0bf6d097b289f4201cf61150.tar.bz2
musl-7a1f7e5a959c1eec0bf6d097b289f4201cf61150.zip
pciutils: Fixed in upstream commit f15db37, release v3.6.1
v3.6.0 broke musl builds in commit 6d701ce. In-tree v3.5.6 builds fine: >>> Completed installing sys-apps/pciutils-3.5.6-r1 into /var/tmp/portage/sys-apps/pciutils-3.5.6-r1/image/ >>> sys-apps/pciutils-3.5.6-r1 merged. Also v3.6.2: >>> Completed installing sys-apps/pciutils-3.6.2-r1 into /var/tmp/portage/sys-apps/pciutils-3.6.2-r1/image/ Signed-off-by: Michael Everitt <gentoo@veremit.xyz> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pciutils/Manifest1
-rw-r--r--sys-apps/pciutils/files/conf.d-pciparm28
-rw-r--r--sys-apps/pciutils/files/init.d-pciparm79
-rw-r--r--sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch13
-rw-r--r--sys-apps/pciutils/files/pciutils-3.6.0-realpath.patch25
-rw-r--r--sys-apps/pciutils/metadata.xml13
-rw-r--r--sys-apps/pciutils/pciutils-3.6.0.ebuild121
7 files changed, 0 insertions, 280 deletions
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
deleted file mode 100644
index 7dc8d96..0000000
--- a/sys-apps/pciutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pciutils-3.6.0.tar.gz 454912 BLAKE2B 1f37307ba21085d5f49dd908781ce34dff98a1e4d818158800a1fbdc1fc689e1b868ee9c762378a8cd28ab17cbaaf1e9255da94c44029bfa2f4a8b5d9fd4b273 SHA512 e59cb5685f1dee2673368c90fdf1f5b7689de9fa45f249ce472258f278288da7a81644c76d1ecb7cc857f8029d3d70c367fe62190caf55328143b51017cc5c6f
diff --git a/sys-apps/pciutils/files/conf.d-pciparm b/sys-apps/pciutils/files/conf.d-pciparm
deleted file mode 100644
index f036b15..0000000
--- a/sys-apps/pciutils/files/conf.d-pciparm
+++ /dev/null
@@ -1,28 +0,0 @@
-# PCI tweaking article:
-# http://www.gentoo.org/doc/en/articles/hardware-stability-p2.xml
-#
-# Apply to all devices:
-# PCIPARM_ALL="...."
-# Cards also can be addressed by vid:pid or by bus:slot.func
-# (see setpci man page relative to -d and -s options)
-# PCIPARM_(BUS|VENDOR)_#="...."
-# Where # is sequentially numbered from zero.
-
-# Examples:
-# "open up" the PCI bus by allowing fairly long bursts
-# for all devices, increasing performance
-# (equivalent to: setpci -v -d *:* latency_timer=b0)
-#PCIPARM_ALL="latency_timer=b0"
-
-# maximize latency timers for network and audio,
-# allowing them to transmit more data per burst,
-# preventing buffer over/under-run conditions
-#PCIPARM_BUS_0="00:04.0 latency_timer=ff"
-#PCIPARM_BUS_1="01:04.0 latency_timer=ff"
-#PCIPARM_VENDOR_0="1057:3410 latency_timer=ff"
-
-# -v : whether to be verbose about changes
-# -D : dry-run, no commit
-# -f : do not warn if the change is already set
-# (see the setpci manpage for more advanced options)
-SETPCI_OPT="-f"
diff --git a/sys-apps/pciutils/files/init.d-pciparm b/sys-apps/pciutils/files/init.d-pciparm
deleted file mode 100644
index 734ca99..0000000
--- a/sys-apps/pciutils/files/init.d-pciparm
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- before bootmisc hdparm
- after localmount
-}
-
-checkconfig() {
- if [ ! -f /etc/conf.d/pciparm ]; then
- ewarn "/etc/conf.d/pciparm does not exist, skipping"
- return 1
- fi
-
- if [ -z "${PCIPARM_ALL}" -a -z "${PCIPARM_BUS_0}" -a -z "${PCIPARM_VENDOR_0}" ]; then
- ewarn "None of PCIPARM_ALL, PCIPARM_BUS_* or PCIPARM_VENDOR_* set in /etc/conf.d/pciparm"
- return 1
- fi
-}
-
-do_setpci() {
- #ewarn "do_setpci: /usr/sbin/setpci $SETPCI_OPT $@"
- SWITCH=$1
- SPEC_ID=$2
- shift 2
- case "$SWITCH" in
- -d) DESC=vendor ;;
- -s) DESC=bus ;;
- *) eerror "Unknown setpci type: $SWITCH" ; return 1 ;;
- esac
-
- if [ -z "$SPEC_ID" ]; then
- eerror "Missing device specifier!"
- return 1
- fi
- if [ -z "$*" ]; then
- eerror "Missing configuration to set for ($DESC) $SPEC_ID!"
- return 1
- fi
-
- ebegin "Setting PCI params for ($DESC) $SPEC_ID to $@"
- /usr/sbin/setpci $SETPCI_OPT $SWITCH $SPEC_ID "$@"
- rc=$?
- eend $rc
- return $rc
-}
-
-do_setpci_array() {
- name=$1
- shift
- i=0
- while true; do
- eval opt="\$${name}_$i"
- # End of loop
- [ -z "${opt}" ] && break
- # Pass in all other parameters here, in case we want to use multiple
- # arguments later.
- do_setpci "$@" $opt #|| return 1
- i=$(($i+1))
- done
-}
-
-start() {
- if get_bootparam "nopciparm" ; then
- ewarn "Skipping pciparm init as requested in kernel cmdline"
- return 0
- fi
-
- checkconfig || return 1
-
- # We do not exit after any errors presently, because it might be a
- # stability-related fix after a failure.
- [ -n "$PCIPARM_ALL" ] && \
- do_setpci -d '*:*' $PCIPARM_ALL #|| return 1
-
- do_setpci_array PCIPARM_BUS -s #|| return 1
- do_setpci_array PCIPARM_VENDOR -d #|| return 1
-}
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
deleted file mode 100644
index 9e63b7e..0000000
--- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
diff --git a/sys-apps/pciutils/files/pciutils-3.6.0-realpath.patch b/sys-apps/pciutils/files/pciutils-3.6.0-realpath.patch
deleted file mode 100644
index d65f719..0000000
--- a/sys-apps/pciutils/files/pciutils-3.6.0-realpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 64716d37e2bed00e06fb3463214d979ca6b3e9c0 Mon Sep 17 00:00:00 2001
-From:
-Date: Mon, 2 Jul 2018 18:22:29 -0500
-Subject: [PATCH] canonicalize_file_name only avaliable on glibc systems
-
----
- lib/sysfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index 1adb50f..c909d0c 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -133,7 +133,7 @@ sysfs_deref_link(struct pci_dev *d, char *link_name)
- sysfs_obj_name(d, "", path);
- strcat(path, rel_path);
-
-- return canonicalize_file_name(path);
-+ return realpath(path, NULL);
- }
-
- static int
---
-2.18.0
-
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
deleted file mode 100644
index 739960f..0000000
--- a/sys-apps/pciutils/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
- <flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
- <flag name="zlib">Support compressed pci.ids database</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/pciutils/pciutils-3.6.0.ebuild b/sys-apps/pciutils/pciutils-3.6.0.ebuild
deleted file mode 100644
index 0a1383a..0000000
--- a/sys-apps/pciutils/pciutils-3.6.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
- udev? ( >=virtual/libudev-208[static-libs(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
- kmod? ( sys-apps/kmod )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/hwids
-"
-DEPEND="
- ${DEPEND}
- kmod? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
- "${FILESDIR}"/${PN}-3.6.0-realpath.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-src_prepare() {
- default
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- append-lfs-flags #471102
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/misc' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}/static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- 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
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
- 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)."
- fi
-}