From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 15 Jun 2024 16:59:19 +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 1sIUsB-006Wxq-1D for lore@lore.pengutronix.de; Sat, 15 Jun 2024 16:59:19 +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 1sIUsA-0001Ha-CT; Sat, 15 Jun 2024 16:59:18 +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 1sIUra-0000Aa-Pc; Sat, 15 Jun 2024 16:58:42 +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 1sIUra-002Weh-A8; Sat, 15 Jun 2024 16:58:42 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sIUra-00HLx2-0s; Sat, 15 Jun 2024 16:58:42 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sat, 15 Jun 2024 16:58:42 +0200 Message-Id: <20240615145842.4135949-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606170052.1255877-1-abbotti@mev.co.uk> References: <20240606170052.1255877-1-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] image-root-ext: add configuration option to set a volume label 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: Ian Abbott 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 d08ea32b611a8fa472e00c3afc95c94a3ec39cfa. Michael [sent from post-receive hook] On Sat, 15 Jun 2024 16:58:42 +0200, Ian Abbott wrote: > genimage supports volume labels for ext2/ext3/ext4 filesystems, so let > us allow it to be configured in PTXdist. > > Signed-off-by: Ian Abbott > Message-Id: <20240606170052.1255877-1-abbotti@mev.co.uk> > Signed-off-by: Michael Olbrich > > diff --git a/config/images/ext.config b/config/images/ext.config > index 0ba21fc72e50..7082234b0440 100644 > --- a/config/images/ext.config > +++ b/config/images/ext.config > @@ -2,6 +2,7 @@ > image @IMAGE@ { > @EXT_TYPE@ { > use-mke2fs = true > + label = "@LABEL@" > } > size = @SIZE@ > mountpoint = "/" > diff --git a/platforms/image-root-ext.in b/platforms/image-root-ext.in > index 950a59c41a89..a2c2b32cddc9 100644 > --- a/platforms/image-root-ext.in > +++ b/platforms/image-root-ext.in > @@ -44,4 +44,12 @@ config IMAGE_ROOT_EXT_TYPE > default "ext3" if IMAGE_ROOT_EXT_EXT3 > default "ext4" if IMAGE_ROOT_EXT_EXT4 > > +config IMAGE_ROOT_EXT_LABEL > + string > + default "" > + prompt "volume label" > + help > + Set a volume label for the file system if the specified label > + is non-empty. The maximum length of the label is 16 bytes. > + > endif > diff --git a/rules/image-root-ext.make b/rules/image-root-ext.make > index 4a51efa5c132..e8eec464fd52 100644 > --- a/rules/image-root-ext.make > +++ b/rules/image-root-ext.make > @@ -20,6 +20,7 @@ IMAGE_ROOT_EXT_IMAGE := $(IMAGEDIR)/root.ext2 > IMAGE_ROOT_EXT_FILES := $(IMAGEDIR)/root.tgz > IMAGE_ROOT_EXT_CONFIG := ext.config > IMAGE_ROOT_EXT_SIZE := $(call remove_quotes,$(PTXCONF_IMAGE_ROOT_EXT_SIZE)) > +IMAGE_ROOT_EXT_LABEL := $(call remove_quotes,$(PTXCONF_IMAGE_ROOT_EXT_LABEL)) > > # ---------------------------------------------------------------------------- > # Image > @@ -35,6 +36,7 @@ IMAGE_ROOT_EXT_SCALE := $(subst %,,$(IMAGE_ROOT_EXT_SIZE))/80/1024/1024 > IMAGE_ROOT_EXT_ENV += \ > SIZE="$(shell echo $$(($(IMAGE_ROOT_EXT_BASE)*$(IMAGE_ROOT_EXT_SCALE)+1))M)" > endif > +IMAGE_ROOT_EXT_ENV += LABEL="$(IMAGE_ROOT_EXT_LABEL)" > > ifdef PTXCONF_IMAGE_ROOT_EXT > $(IMAGE_ROOT_EXT_IMAGE):