diff options
author | Shane Wang <shane.wang@intel.com> | 2012-01-22 17:12:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-24 11:54:25 +0000 |
commit | 27aec8bef61afdcd53b497709dd53bba8224eae3 (patch) | |
tree | 83e99bf04b1167cdc097a7c84b7531d01ae788dc /meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch | |
parent | be76d89496fdefe16852b97cadded4ed956cf401 (diff) | |
download | poky-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/pciutils/pciutils-3.1.7/configure.patch')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch deleted file mode 100644 index ff6f20c68a..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch +++ /dev/null | |||
@@ -1,103 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | # | ||
4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
5 | # | ||
6 | --- | ||
7 | |||
8 | 7/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com> | ||
9 | |||
10 | diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure | ||
11 | --- pciutils-3.1.5.orig/lib/configure 2010-07-30 13:51:58.000000000 +0800 | ||
12 | +++ pciutils-3.1.5/lib/configure 2010-07-30 13:53:25.000000000 +0800 | ||
13 | @@ -14,6 +14,10 @@ | ||
14 | fi | ||
15 | } | ||
16 | |||
17 | +VERSION=$1 | ||
18 | +IDSDIR=$2 | ||
19 | +DNS=yes | ||
20 | + | ||
21 | if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then | ||
22 | echo >&2 "Please run the configure script from the top-level Makefile" | ||
23 | exit 1 | ||
24 | @@ -21,8 +25,8 @@ | ||
25 | |||
26 | echo_n "Configuring libpci for your system..." | ||
27 | if [ -z "$HOST" ] ; then | ||
28 | - sys=`uname -s` | ||
29 | - rel=`uname -r` | ||
30 | + sys=${3:-`uname -s`} | ||
31 | + rel= | ||
32 | realsys="$sys" | ||
33 | if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] | ||
34 | then | ||
35 | @@ -30,7 +34,7 @@ | ||
36 | 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/_.*//'` | ||
38 | else | ||
39 | - cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'` | ||
40 | + cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`} | ||
41 | fi | ||
42 | if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] | ||
43 | then | ||
44 | @@ -40,7 +44,7 @@ | ||
45 | then | ||
46 | sys=cygwin | ||
47 | fi | ||
48 | - HOST=${3:-$cpu-$sys} | ||
49 | + HOST=$cpu-$sys | ||
50 | fi | ||
51 | [ -n "$RELEASE" ] && rel="${RELEASE}" | ||
52 | # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. | ||
53 | @@ -49,6 +53,21 @@ | ||
54 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
55 | echo " $host $rel $cpu $sys" | ||
56 | |||
57 | +if [ "$host" = "linux--gnueabi" ] | ||
58 | +then | ||
59 | + sys=linux | ||
60 | +fi | ||
61 | + | ||
62 | +if [ "$host" = "linux--uclibc" ] | ||
63 | +then | ||
64 | + sys=linux | ||
65 | +fi | ||
66 | + | ||
67 | +if [ "$host" = "linux--uclibceabi" ] | ||
68 | +then | ||
69 | + sys=linux | ||
70 | +fi | ||
71 | + | ||
72 | c=config.h | ||
73 | m=config.mk | ||
74 | echo >$c '#define PCI_CONFIG_H' | ||
75 | diff -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 | ||