summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-22 09:12:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:25 (GMT)
commit27aec8bef61afdcd53b497709dd53bba8224eae3 (patch)
tree83e99bf04b1167cdc097a7c84b7531d01ae788dc /meta/recipes-bsp
parentbe76d89496fdefe16852b97cadded4ed956cf401 (diff)
downloadpoky-27aec8bef61afdcd53b497709dd53bba8224eae3.tar.gz
pciutils: upgrade to 3.1.9
(From OE-Core rev: 745bdcd3421747b050493079101f6f5ba7830daf) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch (renamed from meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch)69
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.9/guess-fix.patch (renamed from meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch)0
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.9/lib-build-fix.patch (renamed from meta/recipes-bsp/pciutils/pciutils-3.1.7/lib-build-fix.patch)0
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.9/makefile.patch (renamed from meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch)0
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.9/pcimodules-pciutils.diff (renamed from meta/recipes-bsp/pciutils/pciutils-3.1.7/pcimodules-pciutils.diff)0
-rw-r--r--meta/recipes-bsp/pciutils/pciutils_3.1.9.bb (renamed from meta/recipes-bsp/pciutils/pciutils_3.1.7.bb)6
6 files changed, 38 insertions, 37 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
index ff6f20c..658e597 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
@@ -6,10 +6,40 @@ Upstream-Status: Inappropriate [embedded specific]
6--- 6---
7 7
87/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com> 87/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com>
91/22/2012 - rebased to 3.1.9 by Shane Wang <shane.wang@intel.com>
9 10
10diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure 11diff -r af2b10cc3c14 Makefile
11--- pciutils-3.1.5.orig/lib/configure 2010-07-30 13:51:58.000000000 +0800 12--- a/Makefile Sun Jan 22 18:36:34 2012 +0800
12+++ pciutils-3.1.5/lib/configure 2010-07-30 13:53:25.000000000 +0800 13+++ b/Makefile Sun Jan 22 18:38:54 2012 +0800
14@@ -37,7 +37,6 @@
15 # Commands
16 INSTALL=install
17 DIRINSTALL=install -d
18-STRIP=-s
19 CC=$(CROSS_COMPILE)gcc
20 AR=$(CROSS_COMPILE)ar
21 RANLIB=$(CROSS_COMPILE)ranlib
22@@ -86,7 +85,7 @@
23 example.o: example.c $(PCIINC)
24
25 %: %.o
26- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
27+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
28
29 %.8 %.7: %.man
30 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)#"
31@@ -101,7 +100,7 @@
32 install: all
33 # -c is ignored on Linux, but required on FreeBSD
34 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
35- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
36+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
37 $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
38 $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
39 $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
40diff -r af2b10cc3c14 lib/configure
41--- a/lib/configure Sun Jan 22 18:36:34 2012 +0800
42+++ b/lib/configure Sun Jan 22 18:38:54 2012 +0800
13@@ -14,6 +14,10 @@ 43@@ -14,6 +14,10 @@
14 fi 44 fi
15 } 45 }
@@ -36,8 +66,8 @@ diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure
36 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` 66 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
37 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` 67 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
38 else 68 else
39- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'` 69- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
40+ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`} 70+ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/`}
41 fi 71 fi
42 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] 72 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
43 then 73 then
@@ -72,32 +102,3 @@ diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure
72 c=config.h 102 c=config.h
73 m=config.mk 103 m=config.mk
74 echo >$c '#define PCI_CONFIG_H' 104 echo >$c '#define PCI_CONFIG_H'
75diff -uNr pciutils-3.1.5.orig/Makefile pciutils-3.1.5/Makefile
76--- pciutils-3.1.5.orig/Makefile 2010-07-30 13:51:58.000000000 +0800
77+++ pciutils-3.1.5/Makefile 2010-07-30 13:52:24.000000000 +0800
78@@ -37,7 +37,6 @@
79 # Commands
80 INSTALL=install
81 DIRINSTALL=install -d
82-STRIP=-s
83 CC=$(CROSS_COMPILE)gcc
84 AR=$(CROSS_COMPILE)ar
85 RANLIB=$(CROSS_COMPILE)ranlib
86@@ -86,7 +85,7 @@
87 example.o: example.c $(PCIINC)
88
89 %: %.o
90- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
91+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
92
93 %.8 %.7: %.man
94 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)#"
95@@ -101,7 +100,7 @@
96 install: all
97 # -c is ignored on Linux, but required on FreeBSD
98 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
99- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
100+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
101 $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
102 $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
103 $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/guess-fix.patch
index 540b4a0..540b4a0 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/guess-fix.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/lib-build-fix.patch
index 7268d53..7268d53 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/lib-build-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/lib-build-fix.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/makefile.patch
index 811aac8..811aac8 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/makefile.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/pcimodules-pciutils.diff b/meta/recipes-bsp/pciutils/pciutils-3.1.9/pcimodules-pciutils.diff
index 0d4e0fb..0d4e0fb 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/pcimodules-pciutils.diff
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/pcimodules-pciutils.diff
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb b/meta/recipes-bsp/pciutils/pciutils_3.1.9.bb
index b48aaf0..51e7476 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.1.9.bb
@@ -9,7 +9,7 @@ LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11RDEPENDS_${PN} = "${PN}-ids" 11RDEPENDS_${PN} = "${PN}-ids"
12PR = "r2" 12PR = "r0"
13 13
14SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ 14SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
15 file://configure.patch \ 15 file://configure.patch \
@@ -18,8 +18,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
18 file://guess-fix.patch \ 18 file://guess-fix.patch \
19 file://makefile.patch" 19 file://makefile.patch"
20 20
21SRC_URI[md5sum] = "35222edb86b50a6641352c66fe829b2e" 21SRC_URI[md5sum] = "79cc1d0bff8603d3a550fa63802cd1db"
22SRC_URI[sha256sum] = "d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544" 22SRC_URI[sha256sum] = "e4ce5d56ae4a9611d51ba0cc2ea45806f9539a18aceb4aa70b8ded50f6923c4f"
23 23
24PARALLEL_MAKE = "" 24PARALLEL_MAKE = ""
25 25