DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>, Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v2 2/4] datapartition: rename to repart-config
Date: Mon, 17 Jun 2024 11:48:16 +0200	[thread overview]
Message-ID: <20240617094818.1019347-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20240617094818.1019347-1-rhi@pengutronix.de>

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 <ada@thorsis.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
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 <r.schwebel@pengutronix.de>")
-	@$(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 <r.schwebel@pengutronix.de>")
+	@$(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




  reply	other threads:[~2024-06-17  9:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-17  9:48 [DistroKit] [PATCH v2 1/4] datapartition: make it selectable Roland Hieber
2024-06-17  9:48 ` Roland Hieber [this message]
2024-06-17  9:48 ` [DistroKit] [PATCH v2 3/4] ptxconfig: create menu for DistroKit-specific rules Roland Hieber
2024-06-19  6:02   ` Michael Olbrich
2024-06-19 12:26     ` Roland Hieber
2024-06-17  9:48 ` [DistroKit] [PATCH v2 4/4] binary_inst: remove outdated example Roland Hieber

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=20240617094818.1019347-2-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --cc=ada@thorsis.com \
    --cc=distrokit@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