pciutils: updated from 3.1.10 to 3.2.

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

7 files changed, 28 insertions, 16 deletions

diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/makefile.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.10/makefile.patch
deleted file mode 100644
index 811aac8e13..0000000000
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.10/makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN pciutils-3.1.7-orig/Makefile pciutils-3.1.7/Makefile
---- pciutils-3.1.7-orig/Makefile	2011-07-11 14:41:59.000000000 +0800
-+++ pciutils-3.1.7/Makefile	2011-07-11 14:42:31.000000000 +0800
-@@ -31,7 +31,7 @@
- IDSDIR=$(SHAREDIR)
- MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
- INCDIR=$(PREFIX)/include
--LIBDIR=$(PREFIX)/lib
-+LIBDIR=$(libdir)
- PKGCFDIR=$(LIBDIR)/pkgconfig
- 
- # Commands
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch
index 66c9f91630..66c9f91630 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch
index 540b4a0d13..540b4a0d13 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.10/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch
index 7268d531d9..7268d531d9 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.10/lib-build-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch
new file mode 100644
index 0000000000..c3fbc6f9b1
--- /dev/null
+++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
+
+Index: pciutils-3.2.0/Makefile
+===================================================================
+--- pciutils-3.2.0.orig/Makefile
++++ pciutils-3.2.0/Makefile
+@@ -35,7 +35,7 @@ SHAREDIR=$(PREFIX)/share
+ IDSDIR=$(SHAREDIR)
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+ INCDIR=$(PREFIX)/include
+-LIBDIR=$(PREFIX)/lib
++LIBDIR=$(libdir)
+ PKGCFDIR=$(LIBDIR)/pkgconfig
+ 
+ # Commands
+@@ -94,7 +94,7 @@ example: example.o lib/$(PCILIB_DEV)
+ example.o: example.c $(PCIINC)
+ 
+ %: %.o
+-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
++	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@
+ 
+ %.8 %.7: %.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)#"
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/pcimodules-pciutils.diff b/meta/recipes-bsp/pciutils/pciutils-3.2.0/pcimodules-pciutils.diff
index 0d4e0fb220..0d4e0fb220 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.10/pcimodules-pciutils.diff
+++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/pcimodules-pciutils.diff
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.1.10.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.0.bb
index e405101abc..602269596b 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.1.10.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.2.0.bb
@@ -18,8 +18,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
            file://guess-fix.patch \
            file://makefile.patch"
 
-SRC_URI[md5sum] = "3a5d8b2784c8571dc5557efda4a8c157"
-SRC_URI[sha256sum] = "f402c2051d9b027799a36f17c5e1750dcb4f07070ec46e79108901d03a83aa75"
+SRC_URI[md5sum] = "d73a1b35e5d5efa70e8476d5917de11f"
+SRC_URI[sha256sum] = "b816943bb06c3338d98e2c705e3b76c9e513830f1f15c76d60e549f965d22a35"
 
 PARALLEL_MAKE = ""