From 7937c7be893e70b38bd881a3207bc549c7f4003c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 5 Dec 2022 10:30:38 +0800 Subject: pciutils: upgrade 3.8.0 -> 3.9.0 configure.patch refreshed for 3.9.0 Changelog: ========== * We decode Compute Express Link (CXL) capabilities. * The tree mode of lspci is now compatible with filtering options. * When setpci is used with a named register, it checks whether the register is present in the particular header type. * Linux: The intel-conf[12] back-ends prefer to use ioperm() instead of iopl() to gain access to I/O ports. * Windows: We have two new back-ends One uses the NT SysDbg interface, the other uses kldbgdrv.sys (which is a part of the Microsoft WinDbg tool). * Windows: We support building libpci as a DLL. Also, Windows binaries now include meta-data with version. * Hurd: The Hurd back-end works again. * mmio-conf1(-ext): Added a new back-end implementing the intel-conf1 interface over MMIO. This is useful on some ARM machines, but it requires manual configuration of the MMIO addresses. * As usually, updated pci.ids to the current snapshot of the database. (From OE-Core rev: 8a784f5aa7ceec1866ef12f2bedf4e8b4e4f269f) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 12 ++-- meta/recipes-bsp/pciutils/pciutils_3.8.0.bb | 64 ---------------------- meta/recipes-bsp/pciutils/pciutils_3.9.0.bb | 64 ++++++++++++++++++++++ 3 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils_3.8.0.bb create mode 100644 meta/recipes-bsp/pciutils/pciutils_3.9.0.bb (limited to 'meta') diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index cf55b94808..91bd255899 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -1,4 +1,4 @@ -From 502c01e180d9085fcbeaf2fb46239999c4f335d2 Mon Sep 17 00:00:00 2001 +From 42e7d5f5f1d84a56b125aa05de33d31e28ad1124 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 @@ -24,20 +24,20 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index 9319bb4..78a2d54 100644 +index 3df076d..9b247d3 100644 --- a/Makefile +++ b/Makefile -@@ -108,7 +108,7 @@ example$(EXEEXT): example.o lib/$(PCILIB) +@@ -110,7 +110,7 @@ example$(EXEEXT): example.o lib/$(PCIIMPLIB) example.o: example.c $(PCIINC) %$(EXEEXT): %.o - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ - %.8 %.7 %.5: %.man - M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#;s#@PCI_IDS@#$(PCI_IDS)#" + ifdef PCI_OS_WINDOWS + comma := , diff --git a/lib/configure b/lib/configure -index 45a416a..1afdaa6 100755 +index 57b064b..b269332 100755 --- a/lib/configure +++ b/lib/configure @@ -9,6 +9,10 @@ echo_n() { diff --git a/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb deleted file mode 100644 index 4f57342e1e..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils_3.8.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] = "91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05" - -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.9.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.9.0.bb new file mode 100644 index 0000000000..f9fe7aa76a --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils_3.9.0.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] = "cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012" + +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