Re: [ptxdist] [APPLIED] libubootenv: Make yaml support optional

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

Thanks, applied as 1a4e37486db0139a3fcffbd6676b26fce2d51afd.

Michael

[sent from post-receive hook]

On Mon, 22 Sep 2025 13:04:28 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> If just used as drop in replacement with the old configuration format,
> libyaml dependency is not required.  You only need to enable it, if you
> intend to use the new, extended configuration format.
> 
> Link: https://github.com/sbabic/libubootenv/blob/master/docs/fw_env_config.md#configuration-file-in-yaml
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20250919100643.199174-6-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libubootenv.in b/rules/libubootenv.in
> index 317a440fc0de..3bee47481cb0 100644
> --- a/rules/libubootenv.in
> +++ b/rules/libubootenv.in
> @@ -3,7 +3,7 @@
>  menuconfig LIBUBOOTENV
>  	tristate
>  	select HOST_CMAKE
> -	select LIBYAML
> +	select LIBYAML if LIBUBOOTENV_YAML_CONFIG
>  	select ZLIB
>  	prompt "libubootenv                   "
>  	help
> @@ -21,6 +21,12 @@ config LIBUBOOTENV_TOOLS
>  	help
>  	  Install fw_printenv and fw_setenv to target.
>  
> +config LIBUBOOTENV_YAML_CONFIG
> +	bool
> +	prompt "extended conf file format"
> +	help
> +	  Support the new, extended, yaml based configuration file format.
> +
>  comment "u-boot-tools is selected!"
>  	depends on U_BOOT_TOOLS
>  
> diff --git a/rules/libubootenv.make b/rules/libubootenv.make
> index d6753cd87081..1ec86693a4e3 100644
> --- a/rules/libubootenv.make
> +++ b/rules/libubootenv.make
> @@ -35,7 +35,7 @@ LIBUBOOTENV_CONF_TOOL	:= cmake
>  LIBUBOOTENV_CONF_OPT	:=  \
>  	$(CROSS_CMAKE_USR) \
>  	-DBUILD_DOC=OFF \
> -	-DNO_YML_SUPPORT=OFF
> +	-DNO_YML_SUPPORT=$(call ptx/ifdef, PTXCONF_LIBUBOOTENV_YAML_CONFIG, OFF, ON)
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install