From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 Nov 2023 19:24:47 +0100 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.94.2) (envelope-from ) id 1qyyqd-00HSfF-Gk for lore@lore.pengutronix.de; Fri, 03 Nov 2023 19:24:47 +0100 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 1qyyqc-00042a-Ed; Fri, 03 Nov 2023 19:24:46 +0100 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 1qyyqW-0003ze-KN; Fri, 03 Nov 2023 19:24:40 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.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 1qyyqW-006Nqt-2O; Fri, 03 Nov 2023 19:24:40 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qyyqW-004PaV-03; Fri, 03 Nov 2023 19:24:40 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Fri, 3 Nov 2023 19:24:29 +0100 Message-Id: <20231103182438.1051601-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 01/10] treewide: images: unify partition labels X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false The partition label is written to the GPT, and systemd-repart can match on the partition label, which we'll use in a later commit. Set the name of the first root partitions to the same name ("root-A") to give the matching algorithm something to work with. Signed-off-by: Roland Hieber --- configs/platform-rpi1/config/images/hd.config | 2 +- .../barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot | 2 +- .../barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot | 2 +- configs/platform-v7a/config/images/hd.config | 2 +- configs/platform-v7a/config/images/stm32mp.config | 2 +- configs/platform-v8a/config/images/imx8m.config | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/platform-rpi1/config/images/hd.config b/configs/platform-rpi1/config/images/hd.config index 7b659a3130ad..949bfa2f182f 100644 --- a/configs/platform-rpi1/config/images/hd.config +++ b/configs/platform-rpi1/config/images/hd.config @@ -9,7 +9,7 @@ image @IMAGE@ { partition-type = 0xc bootable = true } - partition root { + partition root-A { image = root.ext2 partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm } diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot index f3c4d03bcb3e..c0c541c8b2a3 100644 --- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot +++ b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot @@ -1 +1 @@ -mmc0.root-a +mmc0.root-A diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot index 6fab4940a0ba..1d40e339c2fe 100644 --- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot +++ b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot @@ -1 +1 @@ -mmc0.root-b +mmc0.root-B diff --git a/configs/platform-v7a/config/images/hd.config b/configs/platform-v7a/config/images/hd.config index dba48ca106ae..1d041a0ed0a2 100644 --- a/configs/platform-v7a/config/images/hd.config +++ b/configs/platform-v7a/config/images/hd.config @@ -7,7 +7,7 @@ image @IMAGE@ { partition-table-type = "@PARTITION_TABLE_TYPE@" } @BOOTLOADER_PARTITIONS@ - partition root { + partition root-A { image = root.ext2 partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm } diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config index 38bac2483c9c..9dd1a8c850da 100644 --- a/configs/platform-v7a/config/images/stm32mp.config +++ b/configs/platform-v7a/config/images/stm32mp.config @@ -23,7 +23,7 @@ image @IMAGE@ { partition-type-uuid = "4778ed65-bf42-45fa-9c5b-287a1dc4aab1" size = 1M } - partition root-a { + partition root-A { image = root.ext2 } partition root-b { diff --git a/configs/platform-v8a/config/images/imx8m.config b/configs/platform-v8a/config/images/imx8m.config index dfe106612426..59cdac1519db 100644 --- a/configs/platform-v8a/config/images/imx8m.config +++ b/configs/platform-v8a/config/images/imx8m.config @@ -9,7 +9,7 @@ image @IMAGE@ { in-partition-table = false holes = {"(440; 32K)"} } - partition root { + partition root-A { offset = 2M image = "root.ext2" partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae -- 2.39.2