From: Robert Schwebel <r.schwebel@pengutronix.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: distrokit@pengutronix.de
Subject: Re: [DistroKit] [PATCH 01/10] treewide: images: unify partition labels
Date: Mon, 6 Nov 2023 12:43:34 +0100 [thread overview]
Message-ID: <20231106114334.GU4122768@pengutronix.de> (raw)
In-Reply-To: <20231103182438.1051601-1-rhi@pengutronix.de>
Applied series to next.
On Fri, Nov 03, 2023 at 07:24:29PM +0100, Roland Hieber wrote:
> 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 <rhi@pengutronix.de>
> ---
> 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
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
next prev parent reply other threads:[~2023-11-06 11:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-03 18:24 Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 02/10] v7a: image-stm32mp: set GPT Partition Type UUID Roland Hieber
2023-11-06 8:21 ` Ahmad Fatoum
2023-11-03 18:24 ` [DistroKit] [PATCH 03/10] treewide: images: remove size specifications for root partitions Roland Hieber
2023-11-06 8:21 ` Ahmad Fatoum
2023-11-06 9:40 ` Roland Hieber
2023-11-06 9:41 ` Ahmad Fatoum
2023-11-03 18:24 ` [DistroKit] [PATCH 04/10] treewide: images: increase size of all qemu images to 1 GiB Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 05/10] datapartition: generate partitions via systemd-repart Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 06/10] datapartition: add missing mount unit Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 07/10] datapartition: set license Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 08/10] treewide: images: remove root-B and data partitions Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 09/10] rauc-udev: generate symlinks based on GPT partition labels Roland Hieber
2023-11-03 18:24 ` [DistroKit] [PATCH 10/10] v7a: barebox: bootchooser: use " Roland Hieber
2023-11-06 11:43 ` Robert Schwebel [this message]
2023-11-06 11:50 ` [DistroKit] [PATCH 01/10] treewide: images: unify " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231106114334.GU4122768@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=distrokit@pengutronix.de \
--cc=rhi@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox