[Buildroot] [PATCH] pciutils: bump to version 3.3.1

[Buildroot] [PATCH] pciutils: bump to version 3.3.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/pciutils/pciutils.hash |  2 +-
 package/pciutils/pciutils.mk   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash
index 89da715..cc901d1 100644
--- a/package/pciutils/pciutils.hash
+++ b/package/pciutils/pciutils.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc
-sha256	413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7801301	pciutils-3.3.0.tar.xz
+sha256	514a3bdb77e4cdbe9e970e1885af46e0ba2011bf97364368c455ade0edd4e3a9	pciutils-3.3.1.tar.xz
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 5df3a17..1410738 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,13 +4,20 @@
 #
 ################################################################################
 
-PCIUTILS_VERSION = 3.3.0
+PCIUTILS_VERSION = 3.3.1
 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils
 PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz
 PCIUTILS_INSTALL_STAGING = YES
 PCIUTILS_LICENSE = GPLv2+
 PCIUTILS_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+PCIUTILS_DEPENDENCIES += udev
+PCIUTILS_MAKE_OPTS += HWDB=yes
+else
+PCIUTILS_MAKE_OPTS += HWDB=no
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 PCIUTILS_ZLIB=yes
 PCIUTILS_DEPENDENCIES += zlib
@@ -33,7 +40,7 @@ else
 PCIUTILS_SHARED=yes
 endif
 
-PCIUTILS_MAKE_OPTS = \
+PCIUTILS_MAKE_OPTS += \
 	CC="$(TARGET_CC)" \
 	HOST="$(KERNEL_ARCH)-linux" \
 	OPT="$(TARGET_CFLAGS)" \
-- 
2.0.5

[Buildroot] [PATCH] pciutils: bump to version 3.3.1

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Thu,  9 Apr 2015 15:57:46 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/pciutils/pciutils.hash |  2 +-
>  package/pciutils/pciutils.mk   | 11 +++++++++--
>  2 files changed, 10 insertions(+), 3 deletions(-)

I've applied, even though I believe things could be done in a bit nicer
way, see below.

> diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
> index 5df3a17..1410738 100644
> --- a/package/pciutils/pciutils.mk
> +++ b/package/pciutils/pciutils.mk
> @@ -4,13 +4,20 @@
>  #
>  ################################################################################
>  
> -PCIUTILS_VERSION = 3.3.0
> +PCIUTILS_VERSION = 3.3.1
>  PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils
>  PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz
>  PCIUTILS_INSTALL_STAGING = YES
>  PCIUTILS_LICENSE = GPLv2+
>  PCIUTILS_LICENSE_FILES = COPYING
>  
> +ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> +PCIUTILS_DEPENDENCIES += udev
> +PCIUTILS_MAKE_OPTS += HWDB=yes
> +else
> +PCIUTILS_MAKE_OPTS += HWDB=no
> +endif
> +
>  ifeq ($(BR2_PACKAGE_ZLIB),y)
>  PCIUTILS_ZLIB=yes
>  PCIUTILS_DEPENDENCIES += zlib
> @@ -33,7 +40,7 @@ else
>  PCIUTILS_SHARED=yes
>  endif
>  
> -PCIUTILS_MAKE_OPTS = \
> +PCIUTILS_MAKE_OPTS += \
>  	CC="$(TARGET_CC)" \
>  	HOST="$(KERNEL_ARCH)-linux" \
>  	OPT="$(TARGET_CFLAGS)" \

It's a little bit strange to have the unconditional PCIUTILS_MAKE_OPTS
after the conditional ones.

But it's also tied to the fact that for udev you've decided to add
HWDB=<foo> in PCIUTILS_MAKE_OPTS, while for the other dependencies,
they do PCIUTILS_ZLIB = <foo>, and then in PCIUTILS_MAKE_OPTS, they
have ZLIB=$(PCIUTILS_ZLIB).

So things are not very consistent right now. If you can send a
follow-up patch to make things a bit more consistent, it'd be great.

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] pciutils: bump to version 3.3.1

[Gustavo Zacarias]

On 04/09/2015 04:44 PM, Thomas Petazzoni wrote:
> It's a little bit strange to have the unconditional PCIUTILS_MAKE_OPTS
> after the conditional ones.
> 
> But it's also tied to the fact that for udev you've decided to add
> HWDB=<foo> in PCIUTILS_MAKE_OPTS, while for the other dependencies,
> they do PCIUTILS_ZLIB = <foo>, and then in PCIUTILS_MAKE_OPTS, they
> have ZLIB=$(PCIUTILS_ZLIB).
> 
> So things are not very consistent right now. If you can send a
> follow-up patch to make things a bit more consistent, it'd be great.

Yes, i'll send a cleanup.
Regards.