[ptxdist] [PATCH] v4l-utils: version bump 1.24.0 -> 1.24.1

[ptxdist] [PATCH] v4l-utils: version bump 1.24.0 -> 1.24.1

[Philipp Zabel]

Fixes v4l2-tracer build on 32-bit architectures.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/v4l-utils.make | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index 34b13e4e9146..1f4c608b9a84 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
 #
 # Paths and names
 #
-V4L_UTILS_VERSION	:= 1.24.0
-V4L_UTILS_MD5		:= a454d640c9eec26098f246d5f52ef438
+V4L_UTILS_VERSION	:= 1.24.1
+V4L_UTILS_MD5		:= 8ba9c73c4319b6afab5fa4358edc43de
 V4L_UTILS		:= v4l-utils-$(V4L_UTILS_VERSION)
 V4L_UTILS_SUFFIX	:= tar.bz2
 V4L_UTILS_URL		:= http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
@@ -51,7 +51,7 @@ V4L_UTILS_CONF_OPT	:= \
 	--enable-v4l-utils \
 	--enable-v4l2-compliance-libv4l \
 	--disable-v4l2-compliance-32 \
-	--$(call ptx/endis, $(call ptx/ifdef, PTXCONF_ARCH_LP64,PTXCONF_V4L_UTILS_TRACER,))-v4l2-tracer \
+	--$(call ptx/endis, PTXCONF_V4L_UTILS_TRACER)-v4l2-tracer \
 	--enable-v4l2-ctl-libv4l \
 	--enable-v4l2-ctl-stream-to \
 	--disable-v4l2-ctl-32 \
@@ -137,9 +137,7 @@ ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH
 	@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-sysfs-path)
 endif
 ifdef PTXCONF_V4L_UTILS_TRACER
-ifdef PTXCONF_ARCH_LP64
 	@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-tracer)
-endif
 endif
 	@$(call install_finish, v4l-utils)
 
-- 
2.30.2

Re: [ptxdist] [PATCH] v4l-utils: version bump 1.24.0 -> 1.24.1

[Michael Olbrich]

On Tue, Feb 28, 2023 at 11:08:02AM +0100, Philipp Zabel wrote:
> Fixes v4l2-tracer build on 32-bit architectures.

I've squashed this into the update to 1.24.0. Both are in master.

Michael

> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/v4l-utils.make | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index 34b13e4e9146..1f4c608b9a84 100644
> --- a/rules/v4l-utils.make
> +++ b/rules/v4l-utils.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
>  #
>  # Paths and names
>  #
> -V4L_UTILS_VERSION	:= 1.24.0
> -V4L_UTILS_MD5		:= a454d640c9eec26098f246d5f52ef438
> +V4L_UTILS_VERSION	:= 1.24.1
> +V4L_UTILS_MD5		:= 8ba9c73c4319b6afab5fa4358edc43de
>  V4L_UTILS		:= v4l-utils-$(V4L_UTILS_VERSION)
>  V4L_UTILS_SUFFIX	:= tar.bz2
>  V4L_UTILS_URL		:= http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
> @@ -51,7 +51,7 @@ V4L_UTILS_CONF_OPT	:= \
>  	--enable-v4l-utils \
>  	--enable-v4l2-compliance-libv4l \
>  	--disable-v4l2-compliance-32 \
> -	--$(call ptx/endis, $(call ptx/ifdef, PTXCONF_ARCH_LP64,PTXCONF_V4L_UTILS_TRACER,))-v4l2-tracer \
> +	--$(call ptx/endis, PTXCONF_V4L_UTILS_TRACER)-v4l2-tracer \
>  	--enable-v4l2-ctl-libv4l \
>  	--enable-v4l2-ctl-stream-to \
>  	--disable-v4l2-ctl-32 \
> @@ -137,9 +137,7 @@ ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH
>  	@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-sysfs-path)
>  endif
>  ifdef PTXCONF_V4L_UTILS_TRACER
> -ifdef PTXCONF_ARCH_LP64
>  	@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-tracer)
> -endif
>  endif
>  	@$(call install_finish, v4l-utils)
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |