From 27fb21db02e364bea1cafbc4700bbb59e09bf2b2 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Fri, 22 Nov 2013 12:24:34 +0200 Subject: pciutils: upgrade to 3.2.1 (From OE-Core rev: f0edfb3a78657c43fb74ebb1c481af3e9d11fc3f) Signed-off-by: Valentin Popa Signed-off-by: Richard Purdie --- .../pciutils/pciutils-3.2.0/configure.patch | 104 --------------------- .../pciutils/pciutils-3.2.0/guess-fix.patch | 37 -------- .../pciutils/pciutils-3.2.0/lib-build-fix.patch | 92 ------------------ .../pciutils/pciutils-3.2.0/makefile.patch | 26 ------ meta/recipes-bsp/pciutils/pciutils/configure.patch | 104 +++++++++++++++++++++ meta/recipes-bsp/pciutils/pciutils/guess-fix.patch | 37 ++++++++ .../pciutils/pciutils/lib-build-fix.patch | 92 ++++++++++++++++++ meta/recipes-bsp/pciutils/pciutils/makefile.patch | 26 ++++++ meta/recipes-bsp/pciutils/pciutils_3.2.0.bb | 61 ------------ meta/recipes-bsp/pciutils/pciutils_3.2.1.bb | 61 ++++++++++++ 10 files changed, 320 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch create mode 100644 meta/recipes-bsp/pciutils/pciutils/configure.patch create mode 100644 meta/recipes-bsp/pciutils/pciutils/guess-fix.patch create mode 100644 meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch create mode 100644 meta/recipes-bsp/pciutils/pciutils/makefile.patch delete mode 100644 meta/recipes-bsp/pciutils/pciutils_3.2.0.bb create mode 100644 meta/recipes-bsp/pciutils/pciutils_3.2.1.bb (limited to 'meta/recipes-bsp/pciutils') diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch deleted file mode 100644 index 66c9f91630..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils-3.2.0/configure.patch +++ /dev/null @@ -1,104 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# ---- - -7/30/2010 - rebased to 3.1.5 by Qing He -1/22/2012 - rebased to 3.1.9 by Shane Wang - -diff -r af2b10cc3c14 Makefile ---- a/Makefile Sun Jan 22 18:36:34 2012 +0800 -+++ b/Makefile Sun Jan 22 18:38:54 2012 +0800 -@@ -37,7 +37,6 @@ - # Commands - INSTALL=install - DIRINSTALL=install -d --STRIP=-s - CC=$(CROSS_COMPILE)gcc - AR=$(CROSS_COMPILE)ar - RANLIB=$(CROSS_COMPILE)ranlib -@@ -86,7 +85,7 @@ - example.o: example.c $(PCIINC) - - %: %.o -- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ -+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ - - %.8 %.7: %.man - 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)#" -@@ -101,7 +100,7 @@ - install: all - # -c is ignored on Linux, but required on FreeBSD - $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 -- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR) - $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) - $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) - $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 -diff -r af2b10cc3c14 lib/configure ---- a/lib/configure Sun Jan 22 18:36:34 2012 +0800 -+++ b/lib/configure Sun Jan 22 18:38:54 2012 +0800 -@@ -14,6 +14,10 @@ - fi - } - -+VERSION=$1 -+IDSDIR=$2 -+DNS=yes -+ - if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then - echo >&2 "Please run the configure script from the top-level Makefile" - exit 1 -@@ -21,8 +25,8 @@ - - echo_n "Configuring libpci for your system..." - if [ -z "$HOST" ] ; then -- sys=`uname -s` -- rel=`uname -r` -+ sys=${3:-`uname -s`} -+ rel= - realsys="$sys" - if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] - then -@@ -30,7 +34,7 @@ - proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` - cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` - else -- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` -+ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} - fi - if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] - then -@@ -40,7 +44,7 @@ - then - sys=cygwin - fi -- HOST=${3:-$cpu-$sys} -+ HOST=$cpu-$sys - fi - [ -n "$RELEASE" ] && rel="${RELEASE}" - # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -49,6 +53,21 @@ - sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo " $host $rel $cpu $sys" - -+if [ "$host" = "linux--gnueabi" ] -+then -+ sys=linux -+fi -+ -+if [ "$host" = "linux--uclibc" ] -+then -+ sys=linux -+fi -+ -+if [ "$host" = "linux--uclibceabi" ] -+then -+ sys=linux -+fi -+ - c=config.h - m=config.mk - echo >$c '#define PCI_CONFIG_H' diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch deleted file mode 100644 index 540b4a0d13..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils-3.2.0/guess-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -the original guess algorithm is broken for many archs -for example, the following two would break: - arm-linux-gnueabi --> sys=gnueabi - x86_64-unknown-pc-linux-gnu --> sys = pc-linux-gnu - -use a simpler scheme here and hope it works for all the cases - -Upstream-Status: Pending - -7/30/2010 - created by Qing He - -diff --git a/lib/configure b/lib/configure -index 4318b05..84f6acb 100755 ---- a/lib/configure -+++ b/lib/configure -@@ -53,20 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo " $host $rel $cpu $sys" - --if [ "$host" = "linux--gnueabi" ] --then -- sys=linux --fi -- --if [ "$host" = "linux--uclibc" ] --then -- sys=linux --fi -- --if [ "$host" = "linux--uclibceabi" ] --then -- sys=linux --fi -+{ echo "$host" | grep linux; } && sys=linux - - c=config.h - m=config.mk diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch deleted file mode 100644 index 413ef0e1e5..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -Link directly to lib/libpci.so.3.1.5 will hard code this versioned -string into lspci and other utilities, which is not desirable and -won't work. In the other hand, linking to a symbolic link lib/libpci.so -doesn't have this issue. - -Upstream-Status: Pending - -7/30/2010 - created by Qing He - -diff --git a/Makefile b/Makefile -index 74c570a..31337e0 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,9 +56,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h - - export - --all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) -+all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) - --lib/$(PCILIB): $(PCIINC) force -+lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force - $(MAKE) -C lib all - - force: -@@ -66,8 +66,8 @@ force: - lib/config.h lib/config.mk: - cd lib && ./configure - --lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) --setpci: setpci.o common.o lib/$(PCILIB) -+lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV) -+setpci: setpci.o common.o lib/$(PCILIB_DEV) - - LSPCIINC=lspci.h pciutils.h $(PCIINC) - lspci.o: lspci.c $(LSPCIINC) -@@ -89,7 +89,7 @@ update-pciids: update-pciids.sh - chmod +x $@ - - # The example of use of libpci --example: example.o lib/$(PCILIB) -+example: example.o lib/$(PCILIB_DEV) - example.o: example.c $(PCIINC) - - %: %.o -diff --git a/lib/Makefile b/lib/Makefile -index 1eb06a5..a8dab56 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -42,7 +42,7 @@ ifdef PCI_HAVE_PM_NBSD_LIBPCI - OBJS += nbsd-libpci - endif - --all: $(PCILIB) $(PCILIBPC) -+all: $(PCILIB_DEV) $(PCILIBPC) - - ifeq ($(SHARED),no) - $(PCILIB): $(addsuffix .o,$(OBJS)) -@@ -53,6 +53,9 @@ else - CFLAGS += -fPIC -fvisibility=hidden - $(PCILIB): $(addsuffix .o,$(OBJS)) - $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) -+ -+$(PCILIB_DEV): $(PCILIB) -+ ln -s $< $@ - endif - - $(PCILIBPC): libpci.pc.in -diff --git a/lib/configure b/lib/configure -index 27388bc..6c508cf 100755 ---- a/lib/configure -+++ b/lib/configure -@@ -216,16 +216,18 @@ fi - echo "Checking whether to build a shared library... $SHARED (set manually)" - if [ "$SHARED" = no ] ; then - echo >>$m 'PCILIB=$(LIBNAME).a' -+ echo >>$m 'PCILIB_DEV=$(LIBNAME).a' - echo >>$m 'LDLIBS=$(WITH_LIBS)' - echo >>$m 'LIB_LDLIBS=' - else - echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)' -+ echo >>$m 'PCILIB_DEV=$(LIBNAME).so' - # We link the dependencies _to_ the library, so we do not need explicit deps in .pc - echo >>$m 'LDLIBS=' - echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)' - echo >>$c '#define PCI_SHARED_LIB' - if [ "$SHARED" = yes ] ; then -- echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)' -+ echo >>$m 'SONAME=-Wl,-soname -Wl,$(LIBNAME).so$(ABI_VERSION)' - fi - fi - echo >>$m 'PCILIBPC=$(LIBNAME).pc' diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch deleted file mode 100644 index c3fbc6f9b1..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils-3.2.0/makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Ionut Radu - -Index: pciutils-3.2.0/Makefile -=================================================================== ---- pciutils-3.2.0.orig/Makefile -+++ pciutils-3.2.0/Makefile -@@ -35,7 +35,7 @@ SHAREDIR=$(PREFIX)/share - IDSDIR=$(SHAREDIR) - MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) - INCDIR=$(PREFIX)/include --LIBDIR=$(PREFIX)/lib -+LIBDIR=$(libdir) - PKGCFDIR=$(LIBDIR)/pkgconfig - - # Commands -@@ -94,7 +94,7 @@ example: example.o lib/$(PCILIB_DEV) - example.o: example.c $(PCIINC) - - %: %.o -- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ -+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ - - %.8 %.7: %.man - 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/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch new file mode 100644 index 0000000000..66c9f91630 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -0,0 +1,104 @@ +Upstream-Status: Inappropriate [embedded specific] + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# +--- + +7/30/2010 - rebased to 3.1.5 by Qing He +1/22/2012 - rebased to 3.1.9 by Shane Wang + +diff -r af2b10cc3c14 Makefile +--- a/Makefile Sun Jan 22 18:36:34 2012 +0800 ++++ b/Makefile Sun Jan 22 18:38:54 2012 +0800 +@@ -37,7 +37,6 @@ + # Commands + INSTALL=install + DIRINSTALL=install -d +-STRIP=-s + CC=$(CROSS_COMPILE)gcc + AR=$(CROSS_COMPILE)ar + RANLIB=$(CROSS_COMPILE)ranlib +@@ -86,7 +85,7 @@ + example.o: example.c $(PCIINC) + + %: %.o +- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ ++ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ + + %.8 %.7: %.man + 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)#" +@@ -101,7 +100,7 @@ + install: all + # -c is ignored on Linux, but required on FreeBSD + $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 +- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) + $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 +diff -r af2b10cc3c14 lib/configure +--- a/lib/configure Sun Jan 22 18:36:34 2012 +0800 ++++ b/lib/configure Sun Jan 22 18:38:54 2012 +0800 +@@ -14,6 +14,10 @@ + fi + } + ++VERSION=$1 ++IDSDIR=$2 ++DNS=yes ++ + if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then + echo >&2 "Please run the configure script from the top-level Makefile" + exit 1 +@@ -21,8 +25,8 @@ + + echo_n "Configuring libpci for your system..." + if [ -z "$HOST" ] ; then +- sys=`uname -s` +- rel=`uname -r` ++ sys=${3:-`uname -s`} ++ rel= + realsys="$sys" + if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] + then +@@ -30,7 +34,7 @@ + proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` + cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` + else +- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` ++ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} + fi + if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] + then +@@ -40,7 +44,7 @@ + then + sys=cygwin + fi +- HOST=${3:-$cpu-$sys} ++ HOST=$cpu-$sys + fi + [ -n "$RELEASE" ] && rel="${RELEASE}" + # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. +@@ -49,6 +53,21 @@ + sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + echo " $host $rel $cpu $sys" + ++if [ "$host" = "linux--gnueabi" ] ++then ++ sys=linux ++fi ++ ++if [ "$host" = "linux--uclibc" ] ++then ++ sys=linux ++fi ++ ++if [ "$host" = "linux--uclibceabi" ] ++then ++ sys=linux ++fi ++ + c=config.h + m=config.mk + echo >$c '#define PCI_CONFIG_H' diff --git a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch new file mode 100644 index 0000000000..540b4a0d13 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch @@ -0,0 +1,37 @@ +the original guess algorithm is broken for many archs +for example, the following two would break: + arm-linux-gnueabi --> sys=gnueabi + x86_64-unknown-pc-linux-gnu --> sys = pc-linux-gnu + +use a simpler scheme here and hope it works for all the cases + +Upstream-Status: Pending + +7/30/2010 - created by Qing He + +diff --git a/lib/configure b/lib/configure +index 4318b05..84f6acb 100755 +--- a/lib/configure ++++ b/lib/configure +@@ -53,20 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + echo " $host $rel $cpu $sys" + +-if [ "$host" = "linux--gnueabi" ] +-then +- sys=linux +-fi +- +-if [ "$host" = "linux--uclibc" ] +-then +- sys=linux +-fi +- +-if [ "$host" = "linux--uclibceabi" ] +-then +- sys=linux +-fi ++{ echo "$host" | grep linux; } && sys=linux + + c=config.h + m=config.mk diff --git a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch new file mode 100644 index 0000000000..413ef0e1e5 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch @@ -0,0 +1,92 @@ +Link directly to lib/libpci.so.3.1.5 will hard code this versioned +string into lspci and other utilities, which is not desirable and +won't work. In the other hand, linking to a symbolic link lib/libpci.so +doesn't have this issue. + +Upstream-Status: Pending + +7/30/2010 - created by Qing He + +diff --git a/Makefile b/Makefile +index 74c570a..31337e0 100644 +--- a/Makefile ++++ b/Makefile +@@ -56,9 +56,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h + + export + +-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) ++all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) + +-lib/$(PCILIB): $(PCIINC) force ++lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force + $(MAKE) -C lib all + + force: +@@ -66,8 +66,8 @@ force: + lib/config.h lib/config.mk: + cd lib && ./configure + +-lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) +-setpci: setpci.o common.o lib/$(PCILIB) ++lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV) ++setpci: setpci.o common.o lib/$(PCILIB_DEV) + + LSPCIINC=lspci.h pciutils.h $(PCIINC) + lspci.o: lspci.c $(LSPCIINC) +@@ -89,7 +89,7 @@ update-pciids: update-pciids.sh + chmod +x $@ + + # The example of use of libpci +-example: example.o lib/$(PCILIB) ++example: example.o lib/$(PCILIB_DEV) + example.o: example.c $(PCIINC) + + %: %.o +diff --git a/lib/Makefile b/lib/Makefile +index 1eb06a5..a8dab56 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -42,7 +42,7 @@ ifdef PCI_HAVE_PM_NBSD_LIBPCI + OBJS += nbsd-libpci + endif + +-all: $(PCILIB) $(PCILIBPC) ++all: $(PCILIB_DEV) $(PCILIBPC) + + ifeq ($(SHARED),no) + $(PCILIB): $(addsuffix .o,$(OBJS)) +@@ -53,6 +53,9 @@ else + CFLAGS += -fPIC -fvisibility=hidden + $(PCILIB): $(addsuffix .o,$(OBJS)) + $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) ++ ++$(PCILIB_DEV): $(PCILIB) ++ ln -s $< $@ + endif + + $(PCILIBPC): libpci.pc.in +diff --git a/lib/configure b/lib/configure +index 27388bc..6c508cf 100755 +--- a/lib/configure ++++ b/lib/configure +@@ -216,16 +216,18 @@ fi + echo "Checking whether to build a shared library... $SHARED (set manually)" + if [ "$SHARED" = no ] ; then + echo >>$m 'PCILIB=$(LIBNAME).a' ++ echo >>$m 'PCILIB_DEV=$(LIBNAME).a' + echo >>$m 'LDLIBS=$(WITH_LIBS)' + echo >>$m 'LIB_LDLIBS=' + else + echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)' ++ echo >>$m 'PCILIB_DEV=$(LIBNAME).so' + # We link the dependencies _to_ the library, so we do not need explicit deps in .pc + echo >>$m 'LDLIBS=' + echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)' + echo >>$c '#define PCI_SHARED_LIB' + if [ "$SHARED" = yes ] ; then +- echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)' ++ echo >>$m 'SONAME=-Wl,-soname -Wl,$(LIBNAME).so$(ABI_VERSION)' + fi + fi + echo >>$m 'PCILIBPC=$(LIBNAME).pc' diff --git a/meta/recipes-bsp/pciutils/pciutils/makefile.patch b/meta/recipes-bsp/pciutils/pciutils/makefile.patch new file mode 100644 index 0000000000..c3fbc6f9b1 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils/makefile.patch @@ -0,0 +1,26 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Ionut Radu + +Index: pciutils-3.2.0/Makefile +=================================================================== +--- pciutils-3.2.0.orig/Makefile ++++ pciutils-3.2.0/Makefile +@@ -35,7 +35,7 @@ SHAREDIR=$(PREFIX)/share + IDSDIR=$(SHAREDIR) + MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) + INCDIR=$(PREFIX)/include +-LIBDIR=$(PREFIX)/lib ++LIBDIR=$(libdir) + PKGCFDIR=$(LIBDIR)/pkgconfig + + # Commands +@@ -94,7 +94,7 @@ example: example.o lib/$(PCILIB_DEV) + example.o: example.c $(PCIINC) + + %: %.o +- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ ++ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ + + %.8 %.7: %.man + 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.2.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.0.bb deleted file mode 100644 index 6ff468098a..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils_3.2.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "PCI Utilities" -DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ -to PCI bus configuration space and several utilities based on this library.' -DESCRIPTION_pciutils-ids = 'The list of PCI IDs for pciutils' -HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" -SECTION = "console/utils" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "zlib kmod" -RDEPENDS_${PN} = "${PN}-ids" - -SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ - file://configure.patch \ - file://lib-build-fix.patch \ - file://guess-fix.patch \ - file://makefile.patch" - -SRC_URI[md5sum] = "d73a1b35e5d5efa70e8476d5917de11f" -SRC_URI[sha256sum] = "b816943bb06c3338d98e2c705e3b76c9e513830f1f15c76d60e549f965d22a35" - -PARALLEL_MAKE = "" - -PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" - -# see configure.patch -do_configure () { - ( - cd lib && \ - ${PCI_CONF_FLAG} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} - ) -} - -do_compile_prepend () { - # Avoid this error: ln: failed to create symbolic link `libpci.so': File exists - rm -f ${S}/lib/libpci.so -} - -export PREFIX = "${prefix}" -export SBINDIR = "${sbindir}" -export SHAREDIR = "${datadir}" -export MANDIR = "${mandir}" - -EXTRA_OEMAKE += "${PCI_CONF_FLAG}" - -# The configure script breaks if the HOST variable is set -HOST[unexport] = "1" - -do_install () { - oe_runmake DESTDIR=${D} install install-lib - - install -d ${D}${bindir} - ln -s ../sbin/lspci ${D}${bindir}/lspci -} - -PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg" -FILES_pciutils-ids = "${datadir}/pci.ids*" -FILES_libpci = "${libdir}/libpci.so.*" -FILES_libpci-dbg = "${libdir}/.debug" -FILES_libpci-dev = "${libdir}/libpci.a ${libdir}/libpci.la ${libdir}/libpci.so \ - ${includedir}/pci ${libdir}/pkgconfig" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb new file mode 100644 index 0000000000..6d45d72b17 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb @@ -0,0 +1,61 @@ +SUMMARY = "PCI Utilities" +DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ +to PCI bus configuration space and several utilities based on this library.' +DESCRIPTION_pciutils-ids = 'The list of PCI IDs for pciutils' +HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" +SECTION = "console/utils" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "zlib kmod" +RDEPENDS_${PN} = "${PN}-ids" + +SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ + file://configure.patch \ + file://lib-build-fix.patch \ + file://guess-fix.patch \ + file://makefile.patch" + +SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc" +SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde" + +PARALLEL_MAKE = "" + +PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" + +# see configure.patch +do_configure () { + ( + cd lib && \ + ${PCI_CONF_FLAG} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} + ) +} + +do_compile_prepend () { + # Avoid this error: ln: failed to create symbolic link `libpci.so': File exists + rm -f ${S}/lib/libpci.so +} + +export PREFIX = "${prefix}" +export SBINDIR = "${sbindir}" +export SHAREDIR = "${datadir}" +export MANDIR = "${mandir}" + +EXTRA_OEMAKE += "${PCI_CONF_FLAG}" + +# The configure script breaks if the HOST variable is set +HOST[unexport] = "1" + +do_install () { + oe_runmake DESTDIR=${D} install install-lib + + install -d ${D}${bindir} + ln -s ../sbin/lspci ${D}${bindir}/lspci +} + +PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg" +FILES_pciutils-ids = "${datadir}/pci.ids*" +FILES_libpci = "${libdir}/libpci.so.*" +FILES_libpci-dbg = "${libdir}/.debug" +FILES_libpci-dev = "${libdir}/libpci.a ${libdir}/libpci.la ${libdir}/libpci.so \ + ${includedir}/pci ${libdir}/pkgconfig" -- cgit v1.2.3-54-g00ecf