summaryrefslogtreecommitdiffstats
path: root/meta/packages/pciutils
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 17:20:38 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-31 17:20:38 +0000
commitf8daac5777849723a50f3e2c03d2e3239a5f497d (patch)
treed36df387c7844af7d65960178cb6506ff4612987 /meta/packages/pciutils
parent78456faa5e4266cd8b554aab3b8b64f610e231d9 (diff)
downloadpoky-f8daac5777849723a50f3e2c03d2e3239a5f497d.tar.gz
pciutils: Upgarde 2.2.4 -> 3.0.3
Diffstat (limited to 'meta/packages/pciutils')
-rw-r--r--meta/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch21
-rw-r--r--meta/packages/pciutils/pciutils-2.2.4/configure.patch40
-rw-r--r--meta/packages/pciutils/pciutils-3.0.3/configure.patch100
-rw-r--r--meta/packages/pciutils/pciutils-3.0.3/pcimodules-pciutils.diff (renamed from meta/packages/pciutils/pciutils-2.2.4/pcimodules-pciutils.diff)70
-rw-r--r--meta/packages/pciutils/pciutils_3.0.3.bb (renamed from meta/packages/pciutils/pciutils_2.2.4.bb)3
5 files changed, 129 insertions, 105 deletions
diff --git a/meta/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch b/meta/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch
deleted file mode 100644
index bfde28c455..0000000000
--- a/meta/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: pciutils-2.2.4/lib/configure
2===================================================================
3--- pciutils-2.2.4.orig/lib/configure 2007-05-16 23:37:38.000000000 +0200
4+++ pciutils-2.2.4/lib/configure 2007-05-17 16:35:24.000000000 +0200
5@@ -39,6 +39,16 @@
6 sys=linux
7 fi
8
9+if [ "$host" = "linux--uclibc" ]
10+then
11+ sys=linux
12+fi
13+
14+if [ "$host" = "linux--uclibcgnueabi" ]
15+then
16+ sys=linux
17+fi
18+
19 c=config.h
20 m=config.mk
21 echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
diff --git a/meta/packages/pciutils/pciutils-2.2.4/configure.patch b/meta/packages/pciutils/pciutils-2.2.4/configure.patch
deleted file mode 100644
index 78d113c498..0000000000
--- a/meta/packages/pciutils/pciutils-2.2.4/configure.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: pciutils-2.2.4/lib/configure
7===================================================================
8--- pciutils-2.2.4.orig/lib/configure 2006-09-09 13:06:10.000000000 +0200
9+++ pciutils-2.2.4/lib/configure 2006-10-31 11:52:13.000000000 +0100
10@@ -12,15 +12,15 @@
11 echo_n "Configuring libpci for your system..."
12 idsdir=${1:-/usr/share}
13 version=${2:-0.0}
14-sys=`uname -s`
15-rel=`uname -r`
16+sys=${3:-`uname -s`}
17+rel=${4:-`uname -r`}
18 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
19 then
20 rel=`/usr/bin/oslevel`
21 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
22 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
23 else
24- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
25+ cpu=${5:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`}
26 fi
27 if [ "$sys" = "GNU/kFreeBSD" ]
28 then
29@@ -34,6 +34,11 @@
30 echo " $host $rel"
31 zlib=$5
32
33+if [ "$host" = "linux--gnueabi" ]
34+then
35+ sys=linux
36+fi
37+
38 c=config.h
39 m=config.mk
40 echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
diff --git a/meta/packages/pciutils/pciutils-3.0.3/configure.patch b/meta/packages/pciutils/pciutils-3.0.3/configure.patch
new file mode 100644
index 0000000000..0bfcc0c609
--- /dev/null
+++ b/meta/packages/pciutils/pciutils-3.0.3/configure.patch
@@ -0,0 +1,100 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: pciutils-3.0.3/lib/configure
7===================================================================
8--- pciutils-3.0.3.orig/lib/configure 2008-12-31 00:47:07.000000000 +0000
9+++ pciutils-3.0.3/lib/configure 2008-12-31 01:08:01.000000000 +0000
10@@ -11,6 +11,10 @@
11 fi
12 }
13
14+VERSION=$1
15+IDSDIR=$2
16+DNS=yes
17+
18 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
19 echo >&2 "Please run the configure script from the top-level Makefile"
20 exit 1
21@@ -18,15 +22,15 @@
22
23 echo_n "Configuring libpci for your system..."
24 if [ -z "$HOST" ] ; then
25- sys=`uname -s`
26- rel=`uname -r`
27+ sys=${3:-`uname -s`}
28+ rel=${4:-`uname -r`}
29 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
30 then
31 rel=`/usr/bin/oslevel`
32 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
33 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
34 else
35- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
36+ cpu=${5:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`}
37 fi
38 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
39 then
40@@ -36,7 +40,7 @@
41 then
42 sys=cygwin
43 fi
44- HOST=${3:-$cpu-$sys}
45+ HOST=$cpu-$sys
46 fi
47 [ -n "$RELEASE" ] && rel="${RELEASE}"
48 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
49@@ -45,6 +49,21 @@
50 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
51 echo " $host $rel $cpu $sys"
52
53+if [ "$host" = "linux--gnueabi" ]
54+then
55+ sys=linux
56+fi
57+
58+if [ "$host" = "linux--uclibc" ]
59+then
60+ sys=linux
61+fi
62+
63+if [ "$host" = "linux--uclibcgnueabi" ]
64+then
65+ sys=linux
66+fi
67+
68 c=config.h
69 m=config.mk
70 echo >$c '#define PCI_CONFIG_H'
71Index: pciutils-3.0.3/Makefile
72===================================================================
73--- pciutils-3.0.3.orig/Makefile 2008-12-31 01:07:52.000000000 +0000
74+++ pciutils-3.0.3/Makefile 2008-12-31 01:10:50.000000000 +0000
75@@ -37,7 +37,6 @@
76 # Commands
77 INSTALL=install
78 DIRINSTALL=install -d
79-STRIP=-s
80 CC=$(CROSS_COMPILE)gcc
81 AR=$(CROSS_COMPILE)ar
82 RANLIB=$(CROSS_COMPILE)ranlib
83@@ -78,7 +77,7 @@
84 example.o: example.c $(PCIINC)
85
86 %: %.o
87- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
88+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
89
90 %.8 %.7: %.man
91 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)#"
92@@ -93,7 +92,7 @@
93 install: all
94 # -c is ignored on Linux, but required on FreeBSD
95 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
96- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
97+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
98 $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
99 $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
100 $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/meta/packages/pciutils/pciutils-2.2.4/pcimodules-pciutils.diff b/meta/packages/pciutils/pciutils-3.0.3/pcimodules-pciutils.diff
index a2f3621f40..fba30ac719 100644
--- a/meta/packages/pciutils/pciutils-2.2.4/pcimodules-pciutils.diff
+++ b/meta/packages/pciutils/pciutils-3.0.3/pcimodules-pciutils.diff
@@ -1,69 +1,57 @@
1Index: pciutils-2.2.4/Makefile 1Index: pciutils-3.0.3/Makefile
2=================================================================== 2===================================================================
3--- pciutils-2.2.4.orig/Makefile 2006-09-09 14:57:03.000000000 +0200 3--- pciutils-3.0.3.orig/Makefile 2008-11-09 20:28:18.000000000 +0000
4+++ pciutils-2.2.4/Makefile 2006-10-31 10:59:48.000000000 +0100 4+++ pciutils-3.0.3/Makefile 2008-12-31 00:46:45.000000000 +0000
5@@ -24,7 +24,7 @@ 5@@ -52,7 +52,7 @@
6 6
7 export 7 export
8 8
9-all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS) 9-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
10+all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS) pcimodules pcimodules.8 10+all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) pcimodules pcimodules.8
11 11
12 $(PCILIB): $(PCIINC) force 12 lib/$(PCILIB): $(PCIINC) force
13 $(MAKE) -C lib all 13 $(MAKE) -C lib all
14@@ -34,9 +34,11 @@ 14@@ -62,9 +62,11 @@
15 lib/config.h lib/config.mk: 15 lib/config.h lib/config.mk:
16 cd lib && ./configure "$(IDSDIR)" "$(VERSION)" "$(HOST)" "$(RELEASE)" "$(ZLIB)" 16 cd lib && ./configure
17 17
18+pcimodules: pcimodules.o common.o $(PCILIB) 18+pcimodules: pcimodules.o common.o lib/$(PCILIB)
19 lspci: lspci.o common.o $(PCILIB) 19 lspci: lspci.o common.o lib/$(PCILIB)
20 setpci: setpci.o common.o $(PCILIB) 20 setpci: setpci.o common.o lib/$(PCILIB)
21 21
22+pcimodules.o: pcimodules.c pciutils.h 22+pcimodules.o: pcimodules.c pciutils.h
23 lspci.o: lspci.c pciutils.h $(PCIINC) 23 lspci.o: lspci.c pciutils.h $(PCIINC)
24 setpci.o: setpci.c pciutils.h $(PCIINC) 24 setpci.o: setpci.c pciutils.h $(PCIINC)
25 common.o: common.c pciutils.h $(PCIINC) 25 common.o: common.c pciutils.h $(PCIINC)
26@@ -58,15 +60,15 @@ 26@@ -93,10 +95,10 @@
27 install: all 27 install: all
28 # -c is ignored on Linux, but required on FreeBSD 28 # -c is ignored on Linux, but required on FreeBSD
29 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 29 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
30- $(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR) 30- $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
31+ $(INSTALL) -c -m 755 lspci setpci pcimodules $(DESTDIR)$(SBINDIR) 31+ $(INSTALL) -c -m 755 lspci setpci pcimodules $(DESTDIR)$(SBINDIR)
32 $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) 32 $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
33 $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) 33 $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
34- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 34- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
35+ $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 pcimodules.8 $(DESTDIR)$(MANDIR)/man8 35+ $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 pcimodules.8 $(DESTDIR)$(MANDIR)/man8
36 $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
37 ifeq ($(SHARED),yes)
38 $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
39@@ -114,9 +116,9 @@
40 endif
36 41
37 uninstall: all 42 uninstall: all
38- rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids 43- rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids
39+ rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids $(SBINDIR)/pcimodules 44+ rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/pcimodules $(DESTDIR)$(SBINDIR)/update-pciids
40 rm -f $(DESTDIR)$(IDSDIR)/$(PCI_IDS) 45 rm -f $(DESTDIR)$(IDSDIR)/$(PCI_IDS)
41- rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8 46- rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8
42+ rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8 $(MANDIR)/man8/pcimodules.8 47+ rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/pcimodules.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8
43 48 rm -f $(DESTDIR)$(MANDIR)/man7/pcilib.7
44 pci.ids.gz: pci.ids 49 ifeq ($(SHARED),yes)
45 gzip -9 <$< >$@ 50 rm -f $(DESTDIR)$(LIBDIR)/$(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
46Index: pciutils-2.2.4/lspci.c 51Index: pciutils-3.0.3/pcimodules.c
47===================================================================
48--- pciutils-2.2.4.orig/lspci.c 2006-09-09 14:32:29.000000000 +0200
49+++ pciutils-2.2.4/lspci.c 2006-10-31 10:56:57.000000000 +0100
50@@ -120,8 +120,10 @@
51 d->config = xmalloc(64);
52 d->present = xmalloc(64);
53 memset(d->present, 1, 64);
54- if (!pci_read_block(p, 0, d->config, 64))
55- die("Unable to read the standard configuration space header");
56+ if (!pci_read_block(p, 0, d->config, 64)) {
57+ fprintf(stderr, "Unable to read the standard configuration space header");
58+ return NULL;
59+ }
60 if ((d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS)
61 {
62 /* For cardbus bridges, we need to fetch 64 bytes more to get the
63Index: pciutils-2.2.4/pcimodules.c
64=================================================================== 52===================================================================
65--- /dev/null 1970-01-01 00:00:00.000000000 +0000 53--- /dev/null 1970-01-01 00:00:00.000000000 +0000
66+++ pciutils-2.2.4/pcimodules.c 2006-10-31 10:51:09.000000000 +0100 54+++ pciutils-3.0.3/pcimodules.c 2008-12-31 00:41:47.000000000 +0000
67@@ -0,0 +1,185 @@ 55@@ -0,0 +1,185 @@
68+/* 56+/*
69+ * pcimodules: Load all kernel modules for PCI device currently 57+ * pcimodules: Load all kernel modules for PCI device currently
@@ -250,10 +238,10 @@ Index: pciutils-2.2.4/pcimodules.c
250+ match_pci_modules(); 238+ match_pci_modules();
251+ return 0; 239+ return 0;
252+} 240+}
253Index: pciutils-2.2.4/pcimodules.man 241Index: pciutils-3.0.3/pcimodules.man
254=================================================================== 242===================================================================
255--- /dev/null 1970-01-01 00:00:00.000000000 +0000 243--- /dev/null 1970-01-01 00:00:00.000000000 +0000
256+++ pciutils-2.2.4/pcimodules.man 2006-10-31 10:51:09.000000000 +0100 244+++ pciutils-3.0.3/pcimodules.man 2008-12-31 00:41:47.000000000 +0000
257@@ -0,0 +1,92 @@ 245@@ -0,0 +1,92 @@
258+.TH pcimodules 8 "@TODAY@" "@VERSION@" "Linux PCI Utilities" 246+.TH pcimodules 8 "@TODAY@" "@VERSION@" "Linux PCI Utilities"
259+.IX pcimodules 247+.IX pcimodules
diff --git a/meta/packages/pciutils/pciutils_2.2.4.bb b/meta/packages/pciutils/pciutils_3.0.3.bb
index 711e734743..ce683a152a 100644
--- a/meta/packages/pciutils/pciutils_2.2.4.bb
+++ b/meta/packages/pciutils/pciutils_3.0.3.bb
@@ -8,13 +8,10 @@ DEPENDS = "zlib"
8 8
9SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ 9SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
10 file://configure.patch;patch=1 \ 10 file://configure.patch;patch=1 \
11 file://configure-uclibc.patch;patch=1 \
12 file://pcimodules-pciutils.diff;patch=1" 11 file://pcimodules-pciutils.diff;patch=1"
13 12
14PARALLEL_MAKE = "" 13PARALLEL_MAKE = ""
15 14
16PR = "r2"
17
18do_configure () { 15do_configure () {
19 (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH}) 16 (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
20} 17}