From: Chen Qi Date: Mon, 20 May 2024 08:10:37 +0000 (+0800) Subject: pciutils: upgrade from 3.11.1 to 3.12.0 X-Git-Tag: uninative-4.6~538 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ab0efeda625892f393576fbcc87e9b517103f5;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git pciutils: upgrade from 3.11.1 to 3.12.0 configure.patch is rebased against the new version. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index 5015cf48844..0ff151b8cff 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -1,4 +1,4 @@ -From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001 +From 6af07e1f812b2444d33ce199308c87e04b2f5dc7 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 @@ -23,20 +23,20 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index aaec04e..9c1dab0 100644 +index be23593..aa13be5 100644 --- a/Makefile +++ b/Makefile @@ -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 $@ -+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ +- $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ ifdef PCI_OS_WINDOWS comma := , diff --git a/lib/configure b/lib/configure -index 3df057a..c87e71c 100755 +index d02160b..52c1eee 100755 --- a/lib/configure +++ b/lib/configure @@ -9,6 +9,10 @@ echo_n() { @@ -88,3 +88,6 @@ index 3df057a..c87e71c 100755 c=config.h m=config.mk echo >$c '#define PCI_CONFIG_H' +-- +2.42.0 + diff --git a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb similarity index 95% rename from meta/recipes-bsp/pciutils/pciutils_3.11.1.bb rename to meta/recipes-bsp/pciutils/pciutils_3.12.0.bb index 044074ccc3a..480a3386966 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb @@ -14,7 +14,7 @@ DEPENDS = "zlib kmod make-native" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[sha256sum] = "3f472ad864473de5ba17f765cc96ef5f33e1b730918d3adda6f945a2a9290df4" +SRC_URI[sha256sum] = "f185d116d5ff99b797497efce8f19f1ee8ccc5a668b97a159e3d13472f674154" inherit multilib_header pkgconfig update-alternatives