From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WVm4a-000519-SC for ptxdist@pengutronix.de; Thu, 03 Apr 2014 20:09:28 +0200 Received: by mail-we0-f175.google.com with SMTP id q58so2277835wes.34 for ; Thu, 03 Apr 2014 11:09:03 -0700 (PDT) From: Alexander Aring Date: Thu, 3 Apr 2014 20:08:54 +0200 Message-Id: <1396548535-18252-2-git-send-email-alex.aring@gmail.com> In-Reply-To: <1396548535-18252-1-git-send-email-alex.aring@gmail.com> References: <1396548535-18252-1-git-send-email-alex.aring@gmail.com> Subject: [ptxdist] [PATCH v2 1/2] pciutils: version bump 3.1.2 -> 3.2.1 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Alexander Aring 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 --- rules/pciutils.in | 40 ++++++++++++++++++++++++++++++++-------- rules/pciutils.make | 34 ++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/rules/pciutils.in b/rules/pciutils.in index 1c11d65..9f9e93e 100644 --- a/rules/pciutils.in +++ b/rules/pciutils.in @@ -1,24 +1,48 @@ ## SECTION=shell_and_console menuconfig PCIUTILS - select ZLIB if PCIUTILS_COMPRESS - depends on !BUSYBOX_LSPCI || ALLYES + select ZLIB if PCIUTILS_COMPRESS + select LIBKMOD if PCIUTILS_LIBKMOD tristate prompt "pciutils " help - The PCI Utilities package contains a library for portable access to PCI bus - configuration registers and several utilities based on this library. + The PCI Utilities package contains a library for portable access + to PCI bus configuration registers and several utilities based on + this library. if PCIUTILS +config PCIUTILS_TOOLS + bool + default y + depends on !BUSYBOX_LSPCI || ALLYES + prompt "pciutils binaries" + help + This option install the pciutils binary tools lspci, setpci and + update-pciids. + +comment "busybox' lspci is selected" + depends on BUSYBOX_LSPCI + +config PCIUTILS_LIBKMOD + bool + prompt "libkmod support" + depends on PCIUTILS_TOOLS + help + Use libkmod to resolve kernel modules on Linux. + +config PCIUTILS_LIBPCI + bool + prompt "libpci support" + help + Generate and install the shared libpci library. + config PCIUTILS_COMPRESS bool default y prompt "compress pci_ids" help - Save storage space by compressing the pci-id database. Access will be a - little bit slower then. + Save storage space by compressing the pci-id database. Access will + be a little bit slower then. endif -comment "busybox' lspci is selected" - depends on BUSYBOX_LSPCI diff --git a/rules/pciutils.make b/rules/pciutils.make index 1490a53..f2a3720 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 ") @$(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) -- 1.9.1 -- ptxdist mailing list ptxdist@pengutronix.de