From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 01 Oct 2021 09:25:22 +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 1mWCv4-0004OJ-Pe for lore@lore.pengutronix.de; Fri, 01 Oct 2021 09:25:22 +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 1mWCv4-0003Ch-Fu; Fri, 01 Oct 2021 09:25:22 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mWCuW-0003CS-Op; Fri, 01 Oct 2021 09:24:49 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id F0AB3DF2; Fri, 1 Oct 2021 09:24:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m2IJ_VLd6PAL; Fri, 1 Oct 2021 09:24:47 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id CBBE51FAD; Fri, 1 Oct 2021 09:24:47 +0200 (CEST) Date: Fri, 1 Oct 2021 09:24:43 +0200 From: Alexander Dahl To: Roland Hieber , ptxdist@pengutronix.de Message-ID: Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de References: <20210930223442.5820-1-rhi@pengutronix.de> Content-Disposition: inline In-Reply-To: <20210930223442.5820-1-rhi@pengutronix.de> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH] 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 MIME-Version: 1.0 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 Hello Roland, nice to see this. One could have set it in a rauc.config copied to the own BSP, but this is simpler to use. Am Fri, Oct 01, 2021 at 12:34:42AM +0200 schrieb Roland Hieber: > 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 > --- > config/images/rauc.config | 5 ++++- > platforms/image-rauc.in | 15 +++++++++++++++ > rules/image-rauc.make | 1 + > 3 files changed, 20 insertions(+), 1 deletion(-) > > 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) \ Tested-by: Alexander Dahl Greets Alex _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de