[DistroKit] [PATCH v3 0/4] recipe cleanup

[DistroKit] [PATCH v3 0/4] recipe cleanup

[Roland Hieber]

PATCH v3:
* fix confused hunk for removing binary-inst from ptxconfig
* change order of last two patches; remove binary-inst example first

PATCH v2: https://lore.distrokit.org/distrokit/20240617094818.1019347-1-rhi@pengutronix.de
* added patches 2..4

PATCH v1: https://lore.distrokit.org/distrokit/20240611102756.3709016-1-rhi@pengutronix.de

Roland Hieber (4):
  datapartition: make it selectable
  datapartition: rename to repart-config
  binary_inst: remove outdated example
  ptxconfig: create menu for DistroKit-specific rules

 configs/ptxconfig                             |  8 +-
 rules/binary_inst.in                          | 27 ------
 rules/binary_inst.make                        | 97 -------------------
 rules/datapartition.in                        |  8 --
 rules/distrokit.in                            |  5 +
 rules/rauc-udev.in                            |  2 +-
 rules/repart-config.in                        | 11 +++
 ...{datapartition.make => repart-config.make} | 28 +++---
 8 files changed, 37 insertions(+), 149 deletions(-)
 delete mode 100644 rules/binary_inst.in
 delete mode 100644 rules/binary_inst.make
 delete mode 100644 rules/datapartition.in
 create mode 100644 rules/distrokit.in
 create mode 100644 rules/repart-config.in
 rename rules/{datapartition.make => repart-config.make} (53%)

-- 
2.39.2

[DistroKit] [PATCH v3 1/4] datapartition: make it selectable

[Roland Hieber]

The data partition is not needed for all aspects of the system, and
running systemd-repart to recreate it after writing a new image slows
the debugging cycle considerably. Make it de-selectable to speed up the
debugging process.

Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/datapartition.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/datapartition.in b/rules/datapartition.in
index 5b8c737fb8ad..152a60633658 100644
--- a/rules/datapartition.in
+++ b/rules/datapartition.in
@@ -1,7 +1,7 @@
 ## SECTION=project_specific
 
 config DATAPARTITION
-	tristate
+	tristate "datapartition"
 	select RC_ONCE
 	select SYSTEMD
 	select SYSTEMD_REPART
-- 
2.39.2

[DistroKit] [PATCH v3 2/4] datapartition: rename to repart-config

[Roland Hieber]

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>
Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 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

[DistroKit] [PATCH v3 3/4] binary_inst: remove outdated example

[Roland Hieber]

The current state of the example is outdated, e.g. the empty stages can
just be left out. The recipe can always be recreated by running
"ptxdist newpackage file" and following the steps of the wizard, as
described in the PTXdist manual.

Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/ptxconfig      |  1 -
 rules/binary_inst.in   | 27 ------------
 rules/binary_inst.make | 97 ------------------------------------------
 3 files changed, 125 deletions(-)
 delete mode 100644 rules/binary_inst.in
 delete mode 100644 rules/binary_inst.make

diff --git a/configs/ptxconfig b/configs/ptxconfig
index f5ac373e61d2..c7cdb62e16a5 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -207,7 +207,6 @@ PTXCONF_STRACE=y
 #
 # Root Filesystem               
 #
-# PTXCONF_BINARY_EXAMPLE is not set
 # PTXCONF_FAKE_OVERLAYFS is not set
 PTXCONF_INITMETHOD=y
 # PTXCONF_INITMETHOD_BBINIT is not set
diff --git a/rules/binary_inst.in b/rules/binary_inst.in
deleted file mode 100644
index bbb989bed379..000000000000
--- a/rules/binary_inst.in
+++ /dev/null
@@ -1,27 +0,0 @@
-## SECTION=rootfs
-#
-# This file is just an example how to install binaries to the root filesystem
-# via ptxdist
-#
-menuconfig BINARY_EXAMPLE
-	bool "binary example                "
-	help
-	  This is an example only how to install binary files and archives.
-	  Refer our "How to become a PTXdist Guru" application note on
-	  how to use it.
-
-if BINARY_EXAMPLE
-
-config BINARY_EXAMPLE_FILE
-	bool "install the binary file"
-	help
-	  This example will install the file 'local_src/binary_example/ptx_logo.png'
-	  from this BSP into target's root filesystem in '/example'
-
-config BINARY_EXAMPLE_ARCHIVE
-	bool "install the binary archive"
-	help
-	  This example will install all files from the 'local_src/archive_example/pictures.tgz'
-	  archive from this BSP into target's root filesystem in '/example'
-
-endif
diff --git a/rules/binary_inst.make b/rules/binary_inst.make
deleted file mode 100644
index aa809936e2b2..000000000000
--- a/rules/binary_inst.make
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# This is an example rule file to install some kind of binary data only.
-# Only the targetinstall stage will do something. All other stages are skipped.
-# Nothing has to be built at compile time, the files are expected ready for use
-# as part of the BSP.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BINARY_EXAMPLE) += binary_example
-
-#
-# Paths and names
-#
-BINARY_EXAMPLE_VERSION := 1
-
-# ----------------------------------------------------------------------------
-# omit the 'get' stage (due to the fact, the files are already present)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.get:
-		@$(call targetinfo)
-		@$(call touch)
-
-# ----------------------------------------------------------------------------
-# omit the 'extract' stage (due to the fact, all files are already present)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.extract:
-		@$(call targetinfo)
-		@$(call touch)
-
-# ----------------------------------------------------------------------------
-# omit the 'prepare' stage (due to the fact, nothing is to be built)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.prepare:
-		@$(call targetinfo)
-		@$(call touch)
-
-# ----------------------------------------------------------------------------
-# omit the 'compile' stage (due to the fact, nothing is to be built)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.compile:
-		@$(call targetinfo)
-		@$(call touch)
-
-# ----------------------------------------------------------------------------
-# omit the 'install' stage (due to the fact, nothing is to be installed into the sysroot)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.install:
-		@$(call targetinfo)
-		@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/binary_example.targetinstall:
-	@$(call targetinfo)
-	
-	@$(call install_init, binary_example)
-	@$(call install_fixup, binary_example,PACKAGE,binary_example)
-	@$(call install_fixup, binary_example,PRIORITY,optional)
-	@$(call install_fixup, binary_example,VERSION,$(BINARY_EXAMPLE_VERSION))
-	@$(call install_fixup, binary_example,SECTION,base)
-	@$(call install_fixup, binary_example,AUTHOR,"Juergen Beisert <jbe@pengutronix.de>")
-	@$(call install_fixup, binary_example,DEPENDS,)
-	@$(call install_fixup, binary_example,DESCRIPTION,"A few binary example files")
-
-#
-# Install the single binary file on demand
-#
-ifdef PTXCONF_BINARY_EXAMPLE_FILE
-	@$(call install_copy, binary_example, 0, 0, 0755, /example)
-	@$(call install_copy, binary_example, 0, 0, 0644, \
-		$(PTXDIST_WORKSPACE)/local_src/binary_example/ptx_logo.png, \
-		/example/ptx_logo.png)
-endif
-
-#
-# Install the whole archive on demand
-#
-ifdef PTXCONF_BINARY_EXAMPLE_ARCHIVE
-	@$(call install_archive, binary_example, -, -, \
-		$(PTXDIST_WORKSPACE)/local_src/archive_example/pictures.tgz, \
-		/)
-# note: the third parameter is the 'user id', the forth parameter the 'group id'.
-# If given as '-', the ID from the archive is used. If given as number, this
-# number is used, instead of the ID in the archive.
-endif
-
-	@$(call install_finish, binary_example)
-	@$(call touch)
-- 
2.39.2

[DistroKit] [PATCH v3 4/4] ptxconfig: create menu for DistroKit-specific rules

[Roland Hieber]

This way the main menu doesn't get cluttered up with random recipes.

Link: https://lore.distrokit.org/distrokit/20240613-whenever-enduring-698a9b93370b@thorsis.com/
Suggested-by: Alexander Dahl <ada@thorsis.com>
Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/ptxconfig      | 5 +++++
 rules/distrokit.in     | 5 +++++
 rules/rauc-udev.in     | 2 +-
 rules/repart-config.in | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 rules/distrokit.in

diff --git a/configs/ptxconfig b/configs/ptxconfig
index c7cdb62e16a5..fda7d198e6de 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -2,8 +2,13 @@
 # Automatically generated file; DO NOT EDIT.
 # PTXdist 2024.05.0
 #
+
+#
+# DistroKit                     
+#
 PTXCONF_RAUC_UDEV=y
 PTXCONF_REPART_CONFIG=y
+# end of DistroKit                     
 
 #
 # ------------------------------------
diff --git a/rules/distrokit.in b/rules/distrokit.in
new file mode 100644
index 000000000000..559a5bde0ecd
--- /dev/null
+++ b/rules/distrokit.in
@@ -0,0 +1,5 @@
+## SECTION=project_specific
+
+menu "DistroKit                     "
+source "generated/distrokit.in"
+endmenu
diff --git a/rules/rauc-udev.in b/rules/rauc-udev.in
index f960c537f58f..d18f1c3197d5 100644
--- a/rules/rauc-udev.in
+++ b/rules/rauc-udev.in
@@ -1,4 +1,4 @@
-## SECTION=project_specific
+## SECTION=distrokit
 
 config RAUC_UDEV
 	tristate
diff --git a/rules/repart-config.in b/rules/repart-config.in
index db9828f669f2..ea803c015978 100644
--- a/rules/repart-config.in
+++ b/rules/repart-config.in
@@ -1,4 +1,4 @@
-## SECTION=project_specific
+## SECTION=distrokit
 
 config REPART_CONFIG
 	tristate "repart-config"
-- 
2.39.2

Re: [DistroKit] [PATCH v3 4/4] ptxconfig: create menu for DistroKit-specific rules

[Alexander Dahl]

Hello Roland,

Am Wed, Jun 19, 2024 at 02:32:37PM +0200 schrieb Roland Hieber:
> This way the main menu doesn't get cluttered up with random recipes.
> 
> Link: https://lore.distrokit.org/distrokit/20240613-whenever-enduring-698a9b93370b@thorsis.com/
> Suggested-by: Alexander Dahl <ada@thorsis.com>
> Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/ptxconfig      | 5 +++++
>  rules/distrokit.in     | 5 +++++
>  rules/rauc-udev.in     | 2 +-
>  rules/repart-config.in | 2 +-
>  4 files changed, 12 insertions(+), 2 deletions(-)
>  create mode 100644 rules/distrokit.in
> 
> diff --git a/configs/ptxconfig b/configs/ptxconfig
> index c7cdb62e16a5..fda7d198e6de 100644
> --- a/configs/ptxconfig
> +++ b/configs/ptxconfig
> @@ -2,8 +2,13 @@
>  # Automatically generated file; DO NOT EDIT.
>  # PTXdist 2024.05.0
>  #
> +
> +#
> +# DistroKit                     
> +#
>  PTXCONF_RAUC_UDEV=y
>  PTXCONF_REPART_CONFIG=y
> +# end of DistroKit                     
>  
>  #
>  # ------------------------------------
> diff --git a/rules/distrokit.in b/rules/distrokit.in
> new file mode 100644
> index 000000000000..559a5bde0ecd
> --- /dev/null
> +++ b/rules/distrokit.in
> @@ -0,0 +1,5 @@
> +## SECTION=project_specific
> +
> +menu "DistroKit                     "
> +source "generated/distrokit.in"
> +endmenu
> diff --git a/rules/rauc-udev.in b/rules/rauc-udev.in
> index f960c537f58f..d18f1c3197d5 100644
> --- a/rules/rauc-udev.in
> +++ b/rules/rauc-udev.in
> @@ -1,4 +1,4 @@
> -## SECTION=project_specific
> +## SECTION=distrokit
>  
>  config RAUC_UDEV
>  	tristate
> diff --git a/rules/repart-config.in b/rules/repart-config.in
> index db9828f669f2..ea803c015978 100644
> --- a/rules/repart-config.in
> +++ b/rules/repart-config.in
> @@ -1,4 +1,4 @@
> -## SECTION=project_specific
> +## SECTION=distrokit
>  
>  config REPART_CONFIG
>  	tristate "repart-config"

Looks good overall, so …

Reviewed-by: Alexander Dahl <ada@thorsis.com>

Greets
Alex

Re: [DistroKit] [PATCH v3 0/4] recipe cleanup

[Robert Schwebel]

Applied to next.

(Strange, b4 didn't find the message id yesterday, but today it works)

On Wed, Jun 19, 2024 at 02:32:33PM +0200, Roland Hieber wrote:
> PATCH v3:
> * fix confused hunk for removing binary-inst from ptxconfig
> * change order of last two patches; remove binary-inst example first
> 
> PATCH v2: https://lore.distrokit.org/distrokit/20240617094818.1019347-1-rhi@pengutronix.de
> * added patches 2..4
> 
> PATCH v1: https://lore.distrokit.org/distrokit/20240611102756.3709016-1-rhi@pengutronix.de
> 
> Roland Hieber (4):
>   datapartition: make it selectable
>   datapartition: rename to repart-config
>   binary_inst: remove outdated example
>   ptxconfig: create menu for DistroKit-specific rules
> 
>  configs/ptxconfig                             |  8 +-
>  rules/binary_inst.in                          | 27 ------
>  rules/binary_inst.make                        | 97 -------------------
>  rules/datapartition.in                        |  8 --
>  rules/distrokit.in                            |  5 +
>  rules/rauc-udev.in                            |  2 +-
>  rules/repart-config.in                        | 11 +++
>  ...{datapartition.make => repart-config.make} | 28 +++---
>  8 files changed, 37 insertions(+), 149 deletions(-)
>  delete mode 100644 rules/binary_inst.in
>  delete mode 100644 rules/binary_inst.make
>  delete mode 100644 rules/datapartition.in
>  create mode 100644 rules/distrokit.in
>  create mode 100644 rules/repart-config.in
>  rename rules/{datapartition.make => repart-config.make} (53%)
> 
> -- 
> 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    |