pciutils: remove pcimodules
cover pciutils: remove pcimodules
From: Roy Li <[email protected]>
The following changes since commit 1ab0813c819d3b785178faa458486efa6992c636:
linux-yocto/3.10: genericx86 meta data factoring (2013-09-14 08:36:23 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib roy/pciutils-1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/pciutils-1
Roy Li (1):
pciutils: remove pcimodules
.../pciutils/pciutils-3.2.0/lib-build-fix.patch | 20 +- .../pciutils-3.2.0/pcimodules-pciutils.diff | 340 -------------------- meta/recipes-bsp/pciutils/pciutils_3.2.0.bb | 1 - 3 files changed, 9 insertions(+), 352 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/pcimodules-pciutils.diff
Signature · 1 line
1.7.10.4
PATCH 1/1 pciutils: remove pcimodules
From: Roy Li <[email protected]>
pcimodules can not work due to no modules.pcimap file, and has been replaced by "lspci -k", so we can remove it.
Update lib-build-fix.patch since remove pcimodules-pciutils.diff.
[YOCTO# 5210]
Signed-off-by Roy Li <[email protected]>
--- .../pciutils/pciutils-3.2.0/lib-build-fix.patch | 20 +- .../pciutils-3.2.0/pcimodules-pciutils.diff | 340 -------------------- meta/recipes-bsp/pciutils/pciutils_3.2.0.bb | 1 - 3 files changed, 9 insertions(+), 352 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils-3.2.0/pcimodules-pciutils.diff
meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch +9 -11
@@ -8,35 +8,33 @@ Upstream-Status: Pending 7/30/2010 - created by Qing He <[email protected]> diff --git a/Makefile b/Makefile -index 1b48e18..21af4b3 100644 +index 74c570a..31337e0 100644 --- a/Makefile +++ b/Makefile -@@ -51,9 +51,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h +@@ -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) pcimodules pcimodules.8 -+all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) pcimodules pcimodules.8 +-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: -@@ -61,9 +61,9 @@ force: +@@ -66,8 +66,8 @@ force: lib/config.h lib/config.mk: cd lib && ./configure --pcimodules: pcimodules.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) -setpci: setpci.o common.o lib/$(PCILIB) -+pcimodules: pcimodules.o common.o lib/$(PCILIB_DEV) +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) - pcimodules.o: pcimodules.c pciutils.h LSPCIINC=lspci.h pciutils.h $(PCIINC) -@@ -83,7 +83,7 @@ update-pciids: update-pciids.sh + lspci.o: lspci.c $(LSPCIINC) +@@ -89,7 +89,7 @@ update-pciids: update-pciids.sh chmod +x $@ # The example of use of libpci
@@ -69,10 +67,10 @@ index 1eb06a5..a8dab56 100644 $(PCILIBPC): libpci.pc.in diff --git a/lib/configure b/lib/configure -index eec225a..4318b05 100755 +index 27388bc..6c508cf 100755 --- a/lib/configure +++ b/lib/configure -@@ -174,16 +193,18 @@ fi +@@ -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'
meta/recipes-bsp/pciutils/pciutils-3.2.0/pcimodules-pciutils.diff deleted +0 -340
340 lines not on this page · raw message
meta/recipes-bsp/pciutils/pciutils_3.2.0.bb +0 -1
@@ -13,7 +13,6 @@ PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch \ - file://pcimodules-pciutils.diff \ file://lib-build-fix.patch \ file://guess-fix.patch \ file://makefile.patch"
Signature · 1 line
1.7.10.4