diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-12-26 17:35:30 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-27 09:15:54 +0000 |
commit | 0df811d5afdb947bfef98f7c53268259c99b88be (patch) | |
tree | 5dc8162ac190d8ca85a266a9caea81e50be6f69e | |
parent | 62995a7ab26554842036dd7254ad3b0a46f57273 (diff) | |
download | openembedded-core-0df811d5afdb947bfef98f7c53268259c99b88be.tar.gz |
pciutils: upgrade to 3.3.0
lib-build-fix.patch is removed as it doesn't seem useful.
do_compile_prepend is removed because it's not useful for the new version.
The following line is removed as I don't see any problem without it.
PARALLEL_MAKE = ""
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch | 92 | ||||
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.3.0.bb (renamed from meta/recipes-bsp/pciutils/pciutils_3.2.1.bb) | 14 |
2 files changed, 3 insertions, 103 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch deleted file mode 100644 index 413ef0e1e5..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils/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 <qing.he@intel.com> - -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.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb index 6e29953210..71f7e04d62 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb @@ -8,19 +8,16 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "zlib kmod" -SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch \ - file://lib-build-fix.patch \ file://guess-fix.patch \ file://makefile.patch" -SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc" -SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde" +SRC_URI[md5sum] = "3c19adf32a8457983b71ff376ef7dafe" +SRC_URI[sha256sum] = "413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7801301" inherit multilib_header -PARALLEL_MAKE = "" - PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" # see configure.patch @@ -31,11 +28,6 @@ do_configure () { ) } -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}" |