From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 Apr 2024 17:05:39 +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 1ruvze-007n9i-3A for lore@lore.pengutronix.de; Thu, 11 Apr 2024 17:05:38 +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 1ruvze-0005ax-Kr; Thu, 11 Apr 2024 17:05:38 +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 1ruvz2-0004Gg-En; Thu, 11 Apr 2024 17:05:00 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ruvz2-00BiCA-2L; Thu, 11 Apr 2024 17:05:00 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1ruvz2-005IU5-06; Thu, 11 Apr 2024 17:05:00 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 11 Apr 2024 17:05:00 +0200 Message-Id: <20240411150500.1262686-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410081234.3902043-1-m.tretter@pengutronix.de> References: <20240410081234.3902043-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] rauc/image-rauc: move BUNDLE_VERSION to image-rauc 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: Michael Tretter 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 6ffbc11e383c3d674aca5868dce606d875c544cc. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:59 +0200, Michael Tretter wrote: > RAUC_BUNDLE_VERSION is only used by the image rule to generate the > bundle. Therefore, it belongs into image-rauc. > > This fixes the issue that RAUC is rebuilt on every commit in a BSP, as a > commit changes PTXDIST_BSP_AUTOVERSION, which in turn changes the > configuration of RAUC. The rebuild is not necessary and only the RAUC > bundle should be rebuilt if the version has changed. > > Rename the config, as the move to the image moves the item from the > ptxconfig to the platformconfig. > > Signed-off-by: Michael Tretter > Message-Id: <20240410081234.3902043-1-m.tretter@pengutronix.de> > [mol: fix indention] > Signed-off-by: Michael Olbrich > > diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in > index 2070cf0069c1..2faa8ff7e1d8 100644 > --- a/platforms/image-rauc.in > +++ b/platforms/image-rauc.in > @@ -19,6 +19,13 @@ menuconfig IMAGE_RAUC > > if IMAGE_RAUC > > +config IMAGE_RAUC_BUNDLE_VERSION > + string > + prompt "RAUC Bundle Version" > + default "${PTXDIST_BSP_AUTOVERSION}" > + help > + Version that will be placed in the bundle's metadata. > + > config IMAGE_RAUC_DESCRIPTION > prompt "RAUC Bundle Description" > string > diff --git a/rules/image-rauc.make b/rules/image-rauc.make > index a05c19f61de2..30e460dd8cd7 100644 > --- a/rules/image-rauc.make > +++ b/rules/image-rauc.make > @@ -58,7 +58,7 @@ IMAGE_RAUC_ENV = \ > $(CODE_SIGNING_ENV) \ > RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \ > RAUC_BUNDLE_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \ > - RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \ > + RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_IMAGE_RAUC_BUNDLE_VERSION))" \ > RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \ > RAUC_BUNDLE_DESCRIPTION="$(call remove_quotes, $(PTXCONF_IMAGE_RAUC_DESCRIPTION))" \ > $(IMAGE_RAUC_ENV_HOOK) \ > diff --git a/rules/rauc.in b/rules/rauc.in > index e67f5131c615..ee9c3f955b79 100644 > --- a/rules/rauc.in > +++ b/rules/rauc.in > @@ -105,13 +105,6 @@ config RAUC_COMPATIBLE > Only if the compatible in the targets RAUC system.conf file and those > in the Bundle's manifest match exactly, an update will be performed > > -config RAUC_BUNDLE_VERSION > - string > - prompt "RAUC Bundle Version" > - default "${PTXDIST_BSP_AUTOVERSION}" > - help > - Overwrite the bundle version if needed. > - > endif > > config RAUC_BAREBOX