summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/pciutils
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/pciutils')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/configure.patch69
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/guess-fix.patch27
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/makefile.patch26
-rw-r--r--meta/recipes-bsp/pciutils/pciutils_3.5.4.bb6
4 files changed, 30 insertions, 98 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch
index c87b3500f2..55edfea3f6 100644
--- a/meta/recipes-bsp/pciutils/pciutils/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch
@@ -1,46 +1,36 @@
1Upstream-Status: Inappropriate [embedded specific] 1This patch:
2* ensures we link correctly
3* allows us to optionally pass target information to configure rather than using uname
4* select linux as the platform in most cases we care about
5
6This is a merge of various tweaks to allow us to build pciutils including
7work from:
2 8
3# 97/30/2010 - Qing He <qing.he@intel.com>
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 101/22/2012 - Shane Wang <shane.wang@intel.com>
5# 11Ionut Radu <ionutx.radu@intel.com>
6--- 122017/6/15 - RP - Cleanups and merging patches
7 13
87/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com> 14Upstream-Status: Inappropriate [embedded specific]
91/22/2012 - rebased to 3.1.9 by Shane Wang <shane.wang@intel.com>
10 15
11diff -r af2b10cc3c14 Makefile 16Index: pciutils-3.5.4/Makefile
12--- a/Makefile Sun Jan 22 18:36:34 2012 +0800 17===================================================================
13+++ b/Makefile Sun Jan 22 18:38:54 2012 +0800 18--- pciutils-3.5.4.orig/Makefile
14@@ -37,7 +37,6 @@ 19+++ pciutils-3.5.4/Makefile
15 # Commands 20@@ -96,7 +95,7 @@ example: example.o lib/$(PCILIB)
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) 21 example.o: example.c $(PCIINC)
24 22
25 %: %.o 23 %: %.o
26- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ 24- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
27+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ 25+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@
28 26
29 %.8 %.7: %.man 27 %.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)#" 28 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 @@ 29Index: pciutils-3.5.4/lib/configure
32 install: all 30===================================================================
33 # -c is ignored on Linux, but required on FreeBSD 31--- pciutils-3.5.4.orig/lib/configure
34 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 32+++ pciutils-3.5.4/lib/configure
35- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) 33@@ -14,6 +14,10 @@ echo_n() {
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 34 fi
45 } 35 }
46 36
@@ -51,7 +41,7 @@ diff -r af2b10cc3c14 lib/configure
51 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then 41 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
52 echo >&2 "Please run the configure script from the top-level Makefile" 42 echo >&2 "Please run the configure script from the top-level Makefile"
53 exit 1 43 exit 1
54@@ -21,8 +25,8 @@ 44@@ -21,8 +25,8 @@ fi
55 45
56 echo_n "Configuring libpci for your system..." 46 echo_n "Configuring libpci for your system..."
57 if [ -z "$HOST" ] ; then 47 if [ -z "$HOST" ] ; then
@@ -62,7 +52,7 @@ diff -r af2b10cc3c14 lib/configure
62 realsys="$sys" 52 realsys="$sys"
63 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] 53 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
64 then 54 then
65@@ -30,7 +34,7 @@ 55@@ -30,7 +34,7 @@ if [ -z "$HOST" ] ; then
66 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` 56 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/_.*//'` 57 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
68 else 58 else
@@ -71,7 +61,7 @@ diff -r af2b10cc3c14 lib/configure
71 fi 61 fi
72 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] 62 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
73 then 63 then
74@@ -40,7 +44,7 @@ 64@@ -40,7 +44,7 @@ if [ -z "$HOST" ] ; then
75 then 65 then
76 sys=cygwin 66 sys=cygwin
77 fi 67 fi
@@ -80,14 +70,11 @@ diff -r af2b10cc3c14 lib/configure
80 fi 70 fi
81 [ -n "$RELEASE" ] && rel="${RELEASE}" 71 [ -n "$RELEASE" ] && rel="${RELEASE}"
82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. 72 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
83@@ -49,6 +53,11 @@ 73@@ -49,6 +53,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^
84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 74 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
85 echo " $host $rel $cpu $sys" 75 echo " $host $rel $cpu $sys"
86 76
87+if [ "$host" = "linux--gnueabi" ] 77+{ echo "$host" | grep linux; } && sys=linux
88+then
89+ sys=linux
90+fi
91+ 78+
92 c=config.h 79 c=config.h
93 m=config.mk 80 m=config.mk
diff --git a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
deleted file mode 100644
index f918e3bdc3..0000000000
--- a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1the original guess algorithm is broken for many archs
2for example, the following two would break:
3 arm-linux-gnueabi --> sys=gnueabi
4 x86_64-unknown-pc-linux-gnu --> sys = pc-linux-gnu
5
6use a simpler scheme here and hope it works for all the cases
7
8Upstream-Status: Pending
9
107/30/2010 - created by Qing He <qing.he@intel.com>
11
12diff --git a/lib/configure b/lib/configure
13index 4318b05..84f6acb 100755
14--- a/lib/configure
15+++ b/lib/configure
16@@ -53,10 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
17 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
18 echo " $host $rel $cpu $sys"
19
20-if [ "$host" = "linux--gnueabi" ]
21-then
22- sys=linux
23-fi
24+{ echo "$host" | grep linux; } && sys=linux
25
26 c=config.h
27 m=config.mk
diff --git a/meta/recipes-bsp/pciutils/pciutils/makefile.patch b/meta/recipes-bsp/pciutils/pciutils/makefile.patch
deleted file mode 100644
index c3fbc6f9b1..0000000000
--- a/meta/recipes-bsp/pciutils/pciutils/makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
4
5Index: pciutils-3.2.0/Makefile
6===================================================================
7--- pciutils-3.2.0.orig/Makefile
8+++ pciutils-3.2.0/Makefile
9@@ -35,7 +35,7 @@ SHAREDIR=$(PREFIX)/share
10 IDSDIR=$(SHAREDIR)
11 MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
12 INCDIR=$(PREFIX)/include
13-LIBDIR=$(PREFIX)/lib
14+LIBDIR=$(libdir)
15 PKGCFDIR=$(LIBDIR)/pkgconfig
16
17 # Commands
18@@ -94,7 +94,7 @@ example: example.o lib/$(PCILIB_DEV)
19 example.o: example.c $(PCIINC)
20
21 %: %.o
22- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
23+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@
24
25 %.8 %.7: %.man
26 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.5.4.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb
index d387fba61a..418f712a03 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb
@@ -9,9 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
9DEPENDS = "zlib kmod" 9DEPENDS = "zlib kmod"
10 10
11SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ 11SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
12 file://configure.patch \ 12 file://configure.patch"
13 file://guess-fix.patch \
14 file://makefile.patch"
15 13
16SRC_URI[md5sum] = "e82537cd2194111c45fa7e684b52252e" 14SRC_URI[md5sum] = "e82537cd2194111c45fa7e684b52252e"
17SRC_URI[sha256sum] = "64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe66" 15SRC_URI[sha256sum] = "64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe66"
@@ -21,7 +19,7 @@ inherit multilib_header
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" 19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}"
22PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" 20PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev"
23 21
24PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" 22PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes STRIP= LIBDIR=${libdir}"
25 23
26# see configure.patch 24# see configure.patch
27do_configure () { 25do_configure () {