From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 20 Oct 2021 11:41:33 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1md86G-00072y-W3 for lore@lore.pengutronix.de; Wed, 20 Oct 2021 11:41:32 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1md86G-0001Y4-N0; Wed, 20 Oct 2021 11:41:32 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1md84Q-0007RK-7g; Wed, 20 Oct 2021 11:39:38 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1md84P-0005V4-Mg; Wed, 20 Oct 2021 11:39:37 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1md84P-00GStr-MB; Wed, 20 Oct 2021 11:39:37 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 20 Oct 2021 11:39:37 +0200 Message-Id: <20211020093937.3923986-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930223442.5820-1-rhi@pengutronix.de> References: <20210930223442.5820-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] image-rauc: allow selecting the bundle type (plain or verity) 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: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as d57f4c16c33e47a70fb4f194722455995145e9eb. Michael [sent from post-receive hook] On Wed, 20 Oct 2021 11:39:37 +0200, Roland Hieber wrote: > Newer setups probably want to use the improved 'verity' format, while > existing setups probably need to stay with 'plain' to provide an upgrade > path. See the discussion of the differences between the formats in > . > > Reported-by: Alexander Dahl > Signed-off-by: Roland Hieber > Tested-by: Alexander Dahl > Message-Id: <20210930223442.5820-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/config/images/rauc.config b/config/images/rauc.config > index 0c824f00e5d3..ddf40fb17054 100644 > --- a/config/images/rauc.config > +++ b/config/images/rauc.config > @@ -7,7 +7,10 @@ image @IMAGE@ { > version=@RAUC_BUNDLE_VERSION@ > build=@RAUC_BUNDLE_BUILD@ > description=@RAUC_BUNDLE_DESCRIPTION@ > - > + > + [bundle] > + format=@RAUC_BUNDLE_FORMAT@ > + > [image.rootfs] > filename=root.tar.gz > " > diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in > index 1f9427b40f42..3fa5dfc8c13a 100644 > --- a/platforms/image-rauc.in > +++ b/platforms/image-rauc.in > @@ -26,4 +26,19 @@ config IMAGE_RAUC_DESCRIPTION > help > Optional description that will be placed in the Bundles metadata. > > +choice > + prompt "Bundle format" > + > +config IMAGE_RAUC_BUNDLE_FORMAT_PLAIN > + bool "plain" > + help > + The old bundle format, which since rauc 1.5 is now known as 'plain'. > + > +config IMAGE_RAUC_BUNDLE_FORMAT_VERITY > + bool "verity" > + help > + The improved 'verity' bundle format > + > +endchoice > + > endif > diff --git a/rules/image-rauc.make b/rules/image-rauc.make > index fe1b0e89be7c..d70114aa2b85 100644 > --- a/rules/image-rauc.make > +++ b/rules/image-rauc.make > @@ -29,6 +29,7 @@ ifdef PTXCONF_IMAGE_RAUC > IMAGE_RAUC_ENV = \ > $(CODE_SIGNING_ENV) \ > RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \ > + RAUC_BUNDLE_FORMAT="$(call ptx/ifdef,PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY,verity,plain)" \ > RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \ > RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \ > RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de