diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-04-03 20:08:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-04-04 09:46:11 +0200 |
| commit | fde6b55332775f992038789251d3dd70b75cfde2 (patch) | |
| tree | 683bf85478af6133149c0bd9017293bef224c5c5 /rules/pciutils.make | |
| parent | 245ef4b63bd5079ea4b61b1271baa6da6a851b51 (diff) | |
| download | ptxdist-fde6b55332775f992038789251d3dd70b75cfde2.tar.gz ptxdist-fde6b55332775f992038789251d3dd70b75cfde2.tar.xz | |
pciutils: version bump 3.1.2 -> 3.2.1
This patch bumps the version of pciutils from 3.1.2 to 3.2.1.
Also cleanup the rule files:
- remove of the prepare rule.
- use of call ptx/ifdef instead ifdefs.
- Adding support for installing libpci.
- Adding support for libkmod feature.
- Add install of /usr/bin/update-pciids.
- fit the help messages in Kconfig in 80 char width.
- fix $(PTXCONF_ARCH_STRING)--linux to $(PTXCONF_ARCH_STRING)-linux
- Add new entry for installing PCIUTILS_TOOLS.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/pciutils.make')
| -rw-r--r-- | rules/pciutils.make | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/rules/pciutils.make b/rules/pciutils.make index 1490a53b3..f2a372031 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils # # Paths and names # -PCIUTILS_VERSION := 3.1.2 -PCIUTILS_MD5 := 46387fd7a18c33fbb5311fdb3ab9ea12 +PCIUTILS_VERSION := 3.2.1 +PCIUTILS_MD5 := 425b1acad6854cc2bbb06ac8e48e76fc PCIUTILS := pciutils-$(PCIUTILS_VERSION) PCIUTILS_SUFFIX := tar.bz2 PCIUTILS_URL := $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX)) @@ -29,27 +29,25 @@ PCIUTILS_DIR := $(BUILDDIR)/$(PCIUTILS) # Prepare # ---------------------------------------------------------------------------- -PCIUTILS_PATH := PATH=$(CROSS_PATH) +PCIUTILS_CONF_TOOL := NO PCIUTILS_COMPILE_ENV := $(CROSS_ENV) -PCIUTILS_MAKEVARS := \ +PCIUTILS_MAKE_OPT := \ CROSS_COMPILE=$(COMPILER_PREFIX) \ PREFIX=/usr \ SBINDIR='\$$(PREFIX)/bin' \ - HOST=$(PTXCONF_ARCH_STRING)--linux \ + HOST=$(PTXCONF_ARCH_STRING)-linux \ RELEASE=$(KERNEL_HEADER_VERSION) \ + ZLIB=$(call ptx/ifdef,PTXCONF_PCIUTILS_COMPRESS,yes,no) \ + LIBKMOD=$(call ptx/ifdef,PTXCONF_PCIUTILS_LIBKMOD,yes,no) \ + SHARED=$(call ptx/ifdef,PTXCONF_PCIUTILS_LIBPCI,yes,no) \ STRIP= \ DNS=no -ifdef PTXCONF_PCIUTILS_COMPRESS -PCIUTILS_MAKEVARS += ZLIB=yes -else -PCIUTILS_MAKEVARS += ZLIB=no -endif - -$(STATEDIR)/pciutils.prepare: - @$(call targetinfo) - @$(call touch) +PCIUTILS_INSTALL_OPT := \ + $(PCIUTILS_MAKE_OPT) \ + install \ + $(call ptx/ifdef,PTXCONF_PCIUTILS_LIBPCI,install-lib,) # ---------------------------------------------------------------------------- # Target-Install @@ -64,8 +62,16 @@ $(STATEDIR)/pciutils.targetinstall: @$(call install_fixup, pciutils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, pciutils,DESCRIPTION,missing) +ifdef PTXCONF_PCIUTILS_TOOLS @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/lspci) @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/setpci) + @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/update-pciids) +endif + +ifdef PTXCONF_PCIUTILS_LIBPCI + @$(call install_lib, pciutils, 0, 0, 0644, libpci) +endif + ifdef PTXCONF_PCIUTILS_COMPRESS @$(call install_copy, pciutils, 0, 0, 0644, -, \ /usr/share/pci.ids.gz, n) |