Re: [ptxdist] [PATCH 2/3] pciutils: bump version and cleanup

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Apr 01, 2014 at 06:02:34PM +0200, Alexander Aring wrote:
> 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.
>   - Also adds a patch with rename the install dependency from
>     install-pcilib to install-lib, which also install pkg-config files.
>     Smells like a mainline bug, I don't know powertop doesn't find the
>     library otherwise.
> - Addings support for libkmod feature (sounds cool).
> - Add install of /usr/bin/update-pciids.
> - fit the help messages in Kconfig in 80 char width.
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
>  ...iutils-install-lib-dependency-when-SHARED.patch | 31 ++++++++++++++++++++++
>  patches/pciutils-3.2.1/series                      |  1 +
>  rules/pciutils.in                                  | 23 ++++++++++++----
>  rules/pciutils.make                                | 24 ++++++++---------
>  4 files changed, 61 insertions(+), 18 deletions(-)
>  create mode 100644 patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch
>  create mode 100644 patches/pciutils-3.2.1/series
> 
> diff --git a/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch b/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch
> new file mode 100644
> index 0000000..84bc3a5
> --- /dev/null
> +++ b/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch
> @@ -0,0 +1,31 @@
> +From d0d7d419885d98f7d54d0a66b321db08f7974a93 Mon Sep 17 00:00:00 2001
> +From: Alexander Aring <alex.aring@gmail.com>
> +Date: Tue, 1 Apr 2014 14:40:33 +0200
> +Subject: [PATCH] pciutils: install-lib dependency when SHARED
> +
> +This patch rename the install rule dependency from install-pcilib
> +to install-lib, when SHARED=yes. The install-pcilib doesn't install the
> +libpci.pc files for pkg-config but install-lib does. This is necessary
> +for packages like powertop which search for the libpci library.
> +
> +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 0a21ee8..5b91a5f 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -118,7 +118,7 @@ ifeq ($(SHARED),yes)
> + endif
> + 
> + ifeq ($(SHARED),yes)
> +-install: install-pcilib
> ++install: install-lib
> + endif


We can avoid this patch with:

PCIUTILS_INSTALL_OPT := install install-lib

right?

> + 
> + install-pcilib: lib/$(PCILIB)
> +-- 
> +1.9.1
> +
> diff --git a/patches/pciutils-3.2.1/series b/patches/pciutils-3.2.1/series
> new file mode 100644
> index 0000000..c6edb1c
> --- /dev/null
> +++ b/patches/pciutils-3.2.1/series
> @@ -0,0 +1 @@
> +0001-pciutils-install-lib-dependency-when-SHARED.patch
> diff --git a/rules/pciutils.in b/rules/pciutils.in
> index 1c11d65..d44b158 100644
> --- a/rules/pciutils.in
> +++ b/rules/pciutils.in
> @@ -1,12 +1,14 @@
>  ## SECTION=shell_and_console
>  menuconfig PCIUTILS
> -	select ZLIB if PCIUTILS_COMPRESS
> +	select ZLIB	if PCIUTILS_COMPRESS
> +	select LIBKMOD	if PCIUTILS_LIBKMOD
>  	depends on !BUSYBOX_LSPCI || ALLYES

With the libpci option, I think it makes sense to add a PCIUTILS_TOOLS
option (default y). Then we can move the busybox stuff there and you don't
need to care about it in powertop.

>  	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
>  
> @@ -15,9 +17,20 @@ config PCIUTILS_COMPRESS
>  	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.
>  
> +config PCIUTILS_LIBPCI
> +	bool
> +	prompt "install shared libpci library"
> +	help
> +	  Generate and install the shared libpci library.
> +
> +config PCIUTILS_LIBKMOD
> +	bool
> +	prompt "libkmod support"
> +	help
> +	  Use libkmod to resolve kernel modules on Linux.

we usually have an empty line here.

>  endif
>  
>  comment "busybox' lspci is selected"
> diff --git a/rules/pciutils.make b/rules/pciutils.make
> index 1490a53..20365d1 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,7 +29,7 @@ PCIUTILS_DIR		:= $(BUILDDIR)/$(PCIUTILS)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -PCIUTILS_PATH	:= PATH=$(CROSS_PATH)
> +PCIUTILS_CONF_TOOL	:= NO
>  PCIUTILS_COMPILE_ENV	:= $(CROSS_ENV)
>  
>  PCIUTILS_MAKEVARS := \
> @@ -38,19 +38,12 @@ PCIUTILS_MAKEVARS := \
>  	SBINDIR='\$$(PREFIX)/bin' \
>  	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)
> -
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -64,8 +57,13 @@ $(STATEDIR)/pciutils.targetinstall:
>  	@$(call install_fixup, pciutils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
>  	@$(call install_fixup, pciutils,DESCRIPTION,missing)
>  
> +ifdef PTXCONF_PCIUTILS_LIBPCI
> +	@$(call install_lib, pciutils, 0, 0, 0644, libpci)
> +endif
> +
>  	@$(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)
>  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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de