From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 Jun 2024 11:48:24 +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 1sJ8yO-007W8v-1H for lore@lore.pengutronix.de; Mon, 17 Jun 2024 11:48:24 +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 1sJ8yN-0005fB-KY; Mon, 17 Jun 2024 11:48:23 +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 1sJ8yK-0005eG-CO; Mon, 17 Jun 2024 11:48:20 +0200 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 1sJ8yJ-002whR-Vz; Mon, 17 Jun 2024 11:48:20 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sJ8yJ-004HEa-32; Mon, 17 Jun 2024 11:48:19 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Mon, 17 Jun 2024 11:48:16 +0200 Message-Id: <20240617094818.1019347-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617094818.1019347-1-rhi@pengutronix.de> References: <20240617094818.1019347-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 2/4] datapartition: rename to repart-config 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: Alexander Dahl , 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 recipe also creates the second root partition, reflect that in the name of the recipe. Also give the kconfig option a short help text. Link: https://lore.distrokit.org/distrokit/20240613-whenever-enduring-698a9b93370b@thorsis.com/ Suggested-by: Alexander Dahl Signed-off-by: Roland Hieber --- New patch in v2. --- configs/ptxconfig | 2 +- rules/datapartition.in | 8 ------ rules/repart-config.in | 11 ++++++++ ...{datapartition.make => repart-config.make} | 28 +++++++++---------- 4 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 rules/datapartition.in create mode 100644 rules/repart-config.in rename rules/{datapartition.make => repart-config.make} (53%) diff --git a/configs/ptxconfig b/configs/ptxconfig index 7dee68d451a8..f5ac373e61d2 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -2,8 +2,8 @@ # Automatically generated file; DO NOT EDIT. # PTXdist 2024.05.0 # -PTXCONF_DATAPARTITION=y PTXCONF_RAUC_UDEV=y +PTXCONF_REPART_CONFIG=y # # ------------------------------------ diff --git a/rules/datapartition.in b/rules/datapartition.in deleted file mode 100644 index 152a60633658..000000000000 --- a/rules/datapartition.in +++ /dev/null @@ -1,8 +0,0 @@ -## SECTION=project_specific - -config DATAPARTITION - tristate "datapartition" - select RC_ONCE - select SYSTEMD - select SYSTEMD_REPART - default y diff --git a/rules/repart-config.in b/rules/repart-config.in new file mode 100644 index 000000000000..db9828f669f2 --- /dev/null +++ b/rules/repart-config.in @@ -0,0 +1,11 @@ +## SECTION=project_specific + +config REPART_CONFIG + tristate "repart-config" + select RC_ONCE + select SYSTEMD + select SYSTEMD_REPART + default y + help + Install config files to create the additional data and root-B + partitions on first boot diff --git a/rules/datapartition.make b/rules/repart-config.make similarity index 53% rename from rules/datapartition.make rename to rules/repart-config.make index 63d129a0ed05..0ab7ffd244ea 100644 --- a/rules/datapartition.make +++ b/rules/repart-config.make @@ -10,36 +10,36 @@ # # We provide this package # -PACKAGES-$(PTXCONF_DATAPARTITION) += datapartition +PACKAGES-$(PTXCONF_REPART_CONFIG) += repart-config -DATAPARTITION_VERSION := 1 -DATAPARTITION_LICENSE := ignore +REPART_CONFIG_VERSION := 1 +REPART_CONFIG_LICENSE := ignore # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -$(STATEDIR)/datapartition.targetinstall: +$(STATEDIR)/repart-config.targetinstall: @$(call targetinfo) - @$(call install_init, datapartition) - @$(call install_fixup,datapartition,PRIORITY,optional) - @$(call install_fixup,datapartition,SECTION,base) - @$(call install_fixup,datapartition,AUTHOR,"Robert Schwebel ") - @$(call install_fixup,datapartition,DESCRIPTION,missing) + @$(call install_init, repart-config) + @$(call install_fixup,repart-config,PRIORITY,optional) + @$(call install_fixup,repart-config,SECTION,base) + @$(call install_fixup,repart-config,AUTHOR,"Robert Schwebel ") + @$(call install_fixup,repart-config,DESCRIPTION,missing) - @$(call install_copy, datapartition, 0, 0, 0755, /mnt/data) - @$(call install_alternative, datapartition, 0, 0, 0644, \ + @$(call install_copy, repart-config, 0, 0, 0755, /mnt/data) + @$(call install_alternative, repart-config, 0, 0, 0644, \ /usr/lib/systemd/system/mnt-data.mount) @# Note: we only want to call systemd-repart in rc-once, so don't @# install the configs to any path picked up by systemd-repart.service - @$(call install_alternative_tree, datapartition, 0, 0, \ + @$(call install_alternative_tree, repart-config, 0, 0, \ /etc/repart.rc-once.d/) - @$(call install_alternative, datapartition, 0, 0, 0755, \ + @$(call install_alternative, repart-config, 0, 0, 0755, \ /etc/rc.once.d/repart) - @$(call install_finish,datapartition) + @$(call install_finish,repart-config) @$(call touch) -- 2.39.2