diff options
| -rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/configure.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.12.0.bb (renamed from meta/recipes-bsp/pciutils/pciutils_3.11.1.bb) | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index 5015cf4884..0ff151b8cf 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001 | 1 | From 6af07e1f812b2444d33ce199308c87e04b2f5dc7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <rpurdie@linux.intel.com> | 2 | From: Richard Purdie <rpurdie@linux.intel.com> |
| 3 | Date: Wed, 31 Dec 2008 17:20:38 +0000 | 3 | Date: Wed, 31 Dec 2008 17:20:38 +0000 |
| 4 | Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 | 4 | Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 |
| @@ -23,20 +23,20 @@ Upstream-Status: Inappropriate [embedded specific] | |||
| 23 | 2 files changed, 11 insertions(+), 5 deletions(-) | 23 | 2 files changed, 11 insertions(+), 5 deletions(-) |
| 24 | 24 | ||
| 25 | diff --git a/Makefile b/Makefile | 25 | diff --git a/Makefile b/Makefile |
| 26 | index aaec04e..9c1dab0 100644 | 26 | index be23593..aa13be5 100644 |
| 27 | --- a/Makefile | 27 | --- a/Makefile |
| 28 | +++ b/Makefile | 28 | +++ b/Makefile |
| 29 | @@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB) | 29 | @@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB) |
| 30 | pcilmr.o: pcilmr.c $(LMRINC) | 30 | pcilmr.o: pcilmr.c $(LMRINC) |
| 31 | 31 | ||
| 32 | %$(EXEEXT): %.o | 32 | %$(EXEEXT): %.o |
| 33 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | 33 | - $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ |
| 34 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ | 34 | + $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ |
| 35 | 35 | ||
| 36 | ifdef PCI_OS_WINDOWS | 36 | ifdef PCI_OS_WINDOWS |
| 37 | comma := , | 37 | comma := , |
| 38 | diff --git a/lib/configure b/lib/configure | 38 | diff --git a/lib/configure b/lib/configure |
| 39 | index 3df057a..c87e71c 100755 | 39 | index d02160b..52c1eee 100755 |
| 40 | --- a/lib/configure | 40 | --- a/lib/configure |
| 41 | +++ b/lib/configure | 41 | +++ b/lib/configure |
| 42 | @@ -9,6 +9,10 @@ echo_n() { | 42 | @@ -9,6 +9,10 @@ echo_n() { |
| @@ -88,3 +88,6 @@ index 3df057a..c87e71c 100755 | |||
| 88 | c=config.h | 88 | c=config.h |
| 89 | m=config.mk | 89 | m=config.mk |
| 90 | echo >$c '#define PCI_CONFIG_H' | 90 | echo >$c '#define PCI_CONFIG_H' |
| 91 | -- | ||
| 92 | 2.42.0 | ||
| 93 | |||
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb index 044074ccc3..480a338696 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" | |||
| 14 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ | 14 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ |
| 15 | file://configure.patch" | 15 | file://configure.patch" |
| 16 | 16 | ||
| 17 | SRC_URI[sha256sum] = "3f472ad864473de5ba17f765cc96ef5f33e1b730918d3adda6f945a2a9290df4" | 17 | SRC_URI[sha256sum] = "f185d116d5ff99b797497efce8f19f1ee8ccc5a668b97a159e3d13472f674154" |
| 18 | 18 | ||
| 19 | inherit multilib_header pkgconfig update-alternatives | 19 | inherit multilib_header pkgconfig update-alternatives |
| 20 | 20 | ||
