diff options
| author | Christian Melki <christian.melki@t2data.com> | 2022-11-22 13:48:13 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-11-22 22:14:06 +0100 |
| commit | 313c42a70b501e16663367ca0a70bfd4cb5a2bd4 (patch) | |
| tree | cd3a3be2a610d1cedfeeb387f9ff640e2d9e23a9 | |
| parent | 042e2bd2603c2eecf6a0ef7c105ea788491653be (diff) | |
| download | ptxdist-313c42a70b501e16663367ca0a70bfd4cb5a2bd4.tar.gz ptxdist-313c42a70b501e16663367ca0a70bfd4cb5a2bd4.tar.xz | |
pciutils: Version bump. 3.8.0 -> 3.9.0.
A bunch of changes, including more CXL bus stuff.
As more seem to do their releases from github, more projects
seem to "forget" to update their previous official download site.
This obviously causes confusion as to what the plan for distribution is.
* Remove old patches, they're now integrated.
* Move to github URL, the old source isn't updated.
* Move to tar.gz, as the github place only holds that format.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20221122124813.4159576-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/pciutils-3.8.0/0001-Avoid-adding-multiple-version-tags-to-the-same-symbo.patch | 43 | ||||
| -rw-r--r-- | patches/pciutils-3.8.0/series | 4 | ||||
| -rw-r--r-- | rules/pciutils.make | 8 |
3 files changed, 4 insertions, 51 deletions
diff --git a/patches/pciutils-3.8.0/0001-Avoid-adding-multiple-version-tags-to-the-same-symbo.patch b/patches/pciutils-3.8.0/0001-Avoid-adding-multiple-version-tags-to-the-same-symbo.patch deleted file mode 100644 index 37508a837..000000000 --- a/patches/pciutils-3.8.0/0001-Avoid-adding-multiple-version-tags-to-the-same-symbo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Martin Mares <mj@ucw.cz> -Date: Wed, 10 Aug 2022 13:34:28 +0700 -Subject: [PATCH] Avoid adding multiple version tags to the same symbol - -This is apparently forbidden in most versions of binutils. ---- - lib/filter.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/lib/filter.c b/lib/filter.c -index b881b6bc9083..d025a96c8809 100644 ---- a/lib/filter.c -+++ b/lib/filter.c -@@ -303,21 +303,25 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d) - // (their positions in struct pci_filter were declared as RFU). - - STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); -+DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38); - SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); -+DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38); - SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); -+DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38); - SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); - - STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); -+DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38); - SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8); diff --git a/patches/pciutils-3.8.0/series b/patches/pciutils-3.8.0/series deleted file mode 100644 index 727eb6bd5..000000000 --- a/patches/pciutils-3.8.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Avoid-adding-multiple-version-tags-to-the-same-symbo.patch -# 8069683ed7dc2fdda75322aed5794cc5 - git-ptx-patches magic diff --git a/rules/pciutils.make b/rules/pciutils.make index 6333bb642..f593ab6d5 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils # # Paths and names # -PCIUTILS_VERSION := 3.8.0 -PCIUTILS_MD5 := 72ba4ca1eed8b2972a785ee5aac0b138 +PCIUTILS_VERSION := 3.9.0 +PCIUTILS_MD5 := 20aaffb48eedae4827ff1dfe9ea26a92 PCIUTILS := pciutils-$(PCIUTILS_VERSION) -PCIUTILS_SUFFIX := tar.xz -PCIUTILS_URL := $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX)) +PCIUTILS_SUFFIX := tar.gz +PCIUTILS_URL := https://github.com/pciutils/pciutils/archive/refs/tags/v$(PCIUTILS_VERSION).$(PCIUTILS_SUFFIX) PCIUTILS_SOURCE := $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX) PCIUTILS_DIR := $(BUILDDIR)/$(PCIUTILS) PCIUTILS_LICENSE := GPL-2.0-or-later |