From f7accf6941a3f9258643e9c3eb7f77829c310511 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 28 Feb 2024 15:32:35 +0800 Subject: pciutils: upgrade 3.10.0 -> 3.11.1 configure.patch refreshed for 3.11.1 Changelog: =========== * Fixed wrong API version in lib/pci.h. * Updated README.Windows. * Fix compilation on Windows. * update-pciids now supports XZ compression. If libpci is configured with support for compression, all downloaded files are recompressed as gzip. Otherwise they are stored as plain text. * update-pciids now sends itself as the User-Agent. * Added a pcilmr utility for PCIe lane margining. * Re-factored access to i386 ports on all relevant platforms. * Added i386 port access on OpenBSD. * Back-ends for Windows received many bug fixes and improvements. * ECAM back-end now scans ACPI and BIOS memory faster. * Linux systems without pread/pwrite are no longer supported as they are hopefully long gone. This helps avoid the tricky check for presence of pread which was found to fail on musl libc. * Improved decoding of PCIe control and status registers. * Decoding of CXL capabilities now supports up to CXL 3.0. * lspci now displays interrupt message numbers consistently across different capabilities. * Cache of IDs resolved via DNS, which was located in ~/.pci-ids by default, is now stored according to the XDG base directory specification in $XDG_CACHE_HOME/pci-ids. * All source files now have SPDX license identifiers. * Internal: The "aux" fields of structs pci_access and pci_dev reserved for use by back-ends were renamed to backend_data to better reflect their meaning. * As usually, various minor bug fixes and updated pci.ids. (From OE-Core rev: bbda388857284612190b58abe8d73c93e39d1574) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 11 ++-- meta/recipes-bsp/pciutils/pciutils_3.10.0.bb | 64 ---------------------- meta/recipes-bsp/pciutils/pciutils_3.11.1.bb | 64 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils_3.10.0.bb create mode 100644 meta/recipes-bsp/pciutils/pciutils_3.11.1.bb diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index 91bd255899..5015cf4884 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -1,4 +1,4 @@ -From 42e7d5f5f1d84a56b125aa05de33d31e28ad1124 Mon Sep 17 00:00:00 2001 +From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Dec 2008 17:20:38 +0000 Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 @@ -17,18 +17,17 @@ Ionut Radu 2017/6/15 - RP - Cleanups and merging patches Upstream-Status: Inappropriate [embedded specific] - --- Makefile | 2 +- lib/configure | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index 3df076d..9b247d3 100644 +index aaec04e..9c1dab0 100644 --- a/Makefile +++ b/Makefile -@@ -110,7 +110,7 @@ example$(EXEEXT): example.o lib/$(PCIIMPLIB) - example.o: example.c $(PCIINC) +@@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB) + pcilmr.o: pcilmr.c $(LMRINC) %$(EXEEXT): %.o - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ @@ -37,7 +36,7 @@ index 3df076d..9b247d3 100644 ifdef PCI_OS_WINDOWS comma := , diff --git a/lib/configure b/lib/configure -index 57b064b..b269332 100755 +index 3df057a..c87e71c 100755 --- a/lib/configure +++ b/lib/configure @@ -9,6 +9,10 @@ echo_n() { diff --git a/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb deleted file mode 100644 index e27cfd4ced..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "PCI utilities" -DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ -to PCI bus configuration space and several utilities based on this library.' -HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" -SECTION = "console/utils" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -# Can drop make-native when all systems have make 4.3 -# https://git.savannah.gnu.org/cgit/make.git/commit/?id=b90fabc8d6f34fb37d428dc0fb1b8b1951a9fbed -# causes space issues in lib/libpci.pc -DEPENDS = "zlib kmod make-native" - -SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ - file://configure.patch" - -SRC_URI[sha256sum] = "238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9" - -inherit multilib_header pkgconfig update-alternatives - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" -PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" - -PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes STRIP= LIBDIR=${libdir}" - -# see configure.patch -do_configure () { - ( - cd lib && \ - # PACKAGECONFIG_CONFARGS for this recipe could only possibly contain 'HWDB=yes/no', - # so we put it before ./configure - ${PCI_CONF_FLAG} ${PACKAGECONFIG_CONFARGS} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} - ) -} - -export PREFIX = "${prefix}" -export SBINDIR = "${sbindir}" -export SHAREDIR = "${datadir}" -export MANDIR = "${mandir}" - -EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}" - -ASNEEDED = "" - -# The configure script breaks if the HOST variable is set -HOST[unexport] = "1" - -do_install () { - oe_runmake DESTDIR=${D} install install-lib - - install -d ${D}${bindir} - - oe_multilib_header pci/config.h -} - -PACKAGES =+ "${PN}-ids libpci" -FILES:${PN}-ids = "${datadir}/pci.ids*" -FILES:libpci = "${libdir}/libpci.so.*" -SUMMARY:${PN}-ids = "PCI utilities - device ID database" -DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils." -RDEPENDS:${PN} += "${PN}-ids" - -ALTERNATIVE:${PN} = "lspci" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb new file mode 100644 index 0000000000..044074ccc3 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb @@ -0,0 +1,64 @@ +SUMMARY = "PCI utilities" +DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ +to PCI bus configuration space and several utilities based on this library.' +HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" +SECTION = "console/utils" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +# Can drop make-native when all systems have make 4.3 +# https://git.savannah.gnu.org/cgit/make.git/commit/?id=b90fabc8d6f34fb37d428dc0fb1b8b1951a9fbed +# causes space issues in lib/libpci.pc +DEPENDS = "zlib kmod make-native" + +SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ + file://configure.patch" + +SRC_URI[sha256sum] = "3f472ad864473de5ba17f765cc96ef5f33e1b730918d3adda6f945a2a9290df4" + +inherit multilib_header pkgconfig update-alternatives + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" +PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" + +PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes STRIP= LIBDIR=${libdir}" + +# see configure.patch +do_configure () { + ( + cd lib && \ + # PACKAGECONFIG_CONFARGS for this recipe could only possibly contain 'HWDB=yes/no', + # so we put it before ./configure + ${PCI_CONF_FLAG} ${PACKAGECONFIG_CONFARGS} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} + ) +} + +export PREFIX = "${prefix}" +export SBINDIR = "${sbindir}" +export SHAREDIR = "${datadir}" +export MANDIR = "${mandir}" + +EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}" + +ASNEEDED = "" + +# The configure script breaks if the HOST variable is set +HOST[unexport] = "1" + +do_install () { + oe_runmake DESTDIR=${D} install install-lib + + install -d ${D}${bindir} + + oe_multilib_header pci/config.h +} + +PACKAGES =+ "${PN}-ids libpci" +FILES:${PN}-ids = "${datadir}/pci.ids*" +FILES:libpci = "${libdir}/libpci.so.*" +SUMMARY:${PN}-ids = "PCI utilities - device ID database" +DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils." +RDEPENDS:${PN} += "${PN}-ids" + +ALTERNATIVE:${PN} = "lspci" +ALTERNATIVE_PRIORITY = "100" -- cgit v1.2.3-54-g00ecf