summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-14 15:50:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:22 +0100
commit79512d5ef9e7d586ee996e965a2554813695eaa8 (patch)
tree324ffe5b7cf5d0c15c9338a5b6bbb75f28a4a157 /meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch
parent1356f8fefd447064700a41029a9eadbbbd6a1540 (diff)
downloadpoky-79512d5ef9e7d586ee996e965a2554813695eaa8.tar.gz
pciutils: upgrade to 3.1.10
(From OE-Core rev: 8007bbf0bd8ef379340c75370fcdb29e367e5682) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch104
1 files changed, 104 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch
new file mode 100644
index 0000000000..66c9f91630
--- /dev/null
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.10/configure.patch
@@ -0,0 +1,104 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6---
7
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>
10
11diff -r af2b10cc3c14 Makefile
12--- a/Makefile Sun Jan 22 18:36:34 2012 +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
43@@ -14,6 +14,10 @@
44 fi
45 }
46
47+VERSION=$1
48+IDSDIR=$2
49+DNS=yes
50+
51 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
52 echo >&2 "Please run the configure script from the top-level Makefile"
53 exit 1
54@@ -21,8 +25,8 @@
55
56 echo_n "Configuring libpci for your system..."
57 if [ -z "$HOST" ] ; then
58- sys=`uname -s`
59- rel=`uname -r`
60+ sys=${3:-`uname -s`}
61+ rel=
62 realsys="$sys"
63 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
64 then
65@@ -30,7 +34,7 @@
66 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
67 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
68 else
69- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
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/'`}
71 fi
72 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
73 then
74@@ -40,7 +44,7 @@
75 then
76 sys=cygwin
77 fi
78- HOST=${3:-$cpu-$sys}
79+ HOST=$cpu-$sys
80 fi
81 [ -n "$RELEASE" ] && rel="${RELEASE}"
82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
83@@ -49,6 +53,21 @@
84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
85 echo " $host $rel $cpu $sys"
86
87+if [ "$host" = "linux--gnueabi" ]
88+then
89+ sys=linux
90+fi
91+
92+if [ "$host" = "linux--uclibc" ]
93+then
94+ sys=linux
95+fi
96+
97+if [ "$host" = "linux--uclibceabi" ]
98+then
99+ sys=linux
100+fi
101+
102 c=config.h
103 m=config.mk
104 echo >$c '#define PCI_CONFIG_H'