From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 22 Sep 2025 13:04:59 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v0eLr-005vnZ-0Z for lore@lore.pengutronix.de; Mon, 22 Sep 2025 13:04:59 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v0eLq-0000XS-IT; Mon, 22 Sep 2025 13:04:58 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1v0eLM-0007Kh-If; Mon, 22 Sep 2025 13:04:28 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v0eLM-002aDM-1F; Mon, 22 Sep 2025 13:04:28 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1v0eLM-00000008iM0-1Ozy; Mon, 22 Sep 2025 13:04:28 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 22 Sep 2025 13:04:28 +0200 Message-ID: <20250922110428.2077112-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919100643.199174-6-ada@thorsis.com> References: <20250919100643.199174-6-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] libubootenv: Make yaml support optional X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 1a4e37486db0139a3fcffbd6676b26fce2d51afd. Michael [sent from post-receive hook] On Mon, 22 Sep 2025 13:04:28 +0200, Alexander Dahl 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 > Message-Id: <20250919100643.199174-6-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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