From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 06 Jun 2024 19:01:32 +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 1sFGUV-001o1k-2W for lore@lore.pengutronix.de; Thu, 06 Jun 2024 19:01:31 +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 1sFGUV-0006pZ-1k; Thu, 06 Jun 2024 19:01:31 +0200 Received: from smtp95.ord1d.emailsrvr.com ([184.106.54.95]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sFGU8-0006os-Hx for ptxdist@pengutronix.de; Thu, 06 Jun 2024 19:01:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1717693266; bh=w6rXJbi4G6lutnJHEfyhHix1stnYaW8HgzrPEY5Aq4g=; h=From:To:Subject:Date:From; b=n5soFPP/4gXLK4aKxLoxbb+p8DanIZLYgKVCvEQjQ+gvNdf23gGeINj3Fm7QBBL2t SNv/uYb2ZDxRdzxPLAfEm9FWQFZObl6rgNTnwX0wlMnbdFbuGH4HQfildzgXs6kcNf pr0iO6WEQv/igd076tH/p1t5rgioAVwIMEAUNLfg= X-Auth-ID: abbotti@mev.co.uk Received: by smtp4.relay.ord1d.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id 67D19401F1; Thu, 6 Jun 2024 13:01:06 -0400 (EDT) From: Ian Abbott To: ptxdist@pengutronix.de Date: Thu, 6 Jun 2024 18:00:52 +0100 Message-ID: <20240606170052.1255877-1-abbotti@mev.co.uk> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Classification-ID: f7ea48c5-4fba-4732-a7b8-8efab5b5ddc7-1-1 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 genimage supports volume labels for ext2/ext3/ext4 filesystems, so let us allow it to be configured in PTXdist. Signed-off-by: Ian Abbott --- config/images/ext.config | 1 + platforms/image-root-ext.in | 8 ++++++++ rules/image-root-ext.make | 2 ++ 3 files changed, 11 insertions(+) diff --git a/config/images/ext.config b/config/images/ext.config index 0ba21fc72..7082234b0 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 950a59c41..a2c2b32cd 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 4a51efa5c..e8eec464f 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): -- 2.43.0