[ptxdist] [PATCH 1/5] composefs: sort meson options

[ptxdist] [PATCH 1/5] composefs: sort meson options

[Sven Püschel]

Sort the meson options to match the sorting of the configure_helper.py
helper script.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/composefs.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/composefs.make b/rules/composefs.make
index c477249bd..d44f2a1e3 100644
--- a/rules/composefs.make
+++ b/rules/composefs.make
@@ -39,8 +39,8 @@ COMPOSEFS_LICENSE_FILES	:= \
 COMPOSEFS_CONF_TOOL	:= meson
 COMPOSEFS_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
-	-Dman=disabled \
-	-Dfuse=disabled
+	-Dfuse=disabled \
+	-Dman=disabled
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.47.3

[ptxdist] [PATCH 2/5] host-composefs: new host package

[Sven Püschel]

New host package based on the already existing rules for the target
package.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/host-composefs.in   |  7 +++++++
 rules/host-composefs.make | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 rules/host-composefs.in
 create mode 100644 rules/host-composefs.make

diff --git a/rules/host-composefs.in b/rules/host-composefs.in
new file mode 100644
index 000000000..1d9375db5
--- /dev/null
+++ b/rules/host-composefs.in
@@ -0,0 +1,7 @@
+## SECTION=hosttools_noprompt
+
+config HOST_COMPOSEFS
+	tristate
+	default y if ALLYES
+	select HOST_MESON
+	select HOST_OPENSSL
diff --git a/rules/host-composefs.make b/rules/host-composefs.make
new file mode 100644
index 000000000..3567d6fd0
--- /dev/null
+++ b/rules/host-composefs.make
@@ -0,0 +1,27 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2026 by Sven Püschel <s.pueschel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_COMPOSEFS) += host-composefs
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+HOST_COMPOSEFS_CONF_TOOL	:= meson
+HOST_COMPOSEFS_CONF_OPT		:= \
+	$(HOST_MESON_OPT) \
+	-Dfuse=disabled \
+	-Dman=disabled
+
+# vim: syntax=make
-- 
2.47.3

[ptxdist] [PATCH 3/5] host-rauc: use the correct build system options

[Sven Püschel]

While migrating from autoconf to meson, the host options
variable was missed. Adjust it to not mix build system options.

Fixes: 6e72460fe797 ("rauc: migrate to meson")
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/host-rauc.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/host-rauc.make b/rules/host-rauc.make
index b0d398900..2d4e17752 100644
--- a/rules/host-rauc.make
+++ b/rules/host-rauc.make
@@ -20,7 +20,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
 #
 HOST_RAUC_CONF_TOOL	:= meson
 HOST_RAUC_CONF_OPT	:= \
-	$(HOST_AUTOCONF) \
+	$(HOST_MESON_OPT) \
 	-Dcreate=true \
 	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
 	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
-- 
2.47.3

[ptxdist] [PATCH 4/5] host-rauc: enable composefs support

[Sven Püschel]

Unconditionally enable composefs support in the host RAUC package,
as the required composefs dependency is rather small.
This allows the host RAUC to also utilize composefs for artifacts
in update bundles.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/host-rauc.in   | 1 +
 rules/host-rauc.make | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rules/host-rauc.in b/rules/host-rauc.in
index 0dddc742d..bc05d05c8 100644
--- a/rules/host-rauc.in
+++ b/rules/host-rauc.in
@@ -3,6 +3,7 @@
 config HOST_RAUC
 	tristate
 	default y if ALLYES
+	select HOST_COMPOSEFS
 	select HOST_GLIB
 	select HOST_MESON
 	select HOST_OPENSSL
diff --git a/rules/host-rauc.make b/rules/host-rauc.make
index 2d4e17752..40f9f436c 100644
--- a/rules/host-rauc.make
+++ b/rules/host-rauc.make
@@ -21,6 +21,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
 HOST_RAUC_CONF_TOOL	:= meson
 HOST_RAUC_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
+	-Dcomposefs=enabled \
 	-Dcreate=true \
 	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
 	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
-- 
2.47.3

[ptxdist] [PATCH 5/5] host-rauc: add missing options

[Sven Püschel]

Add missing options based on the configure_helper.py script output.
The option values were copied from the rauc.make file for the target.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>

---
sorted after enabling composefs support in host-rauc to avoid having to
disable the composefs support option in this commit and directly adjust
the line in the next commit.
---
 rules/host-rauc.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/host-rauc.make b/rules/host-rauc.make
index 40f9f436c..8b5279b33 100644
--- a/rules/host-rauc.make
+++ b/rules/host-rauc.make
@@ -26,7 +26,9 @@ HOST_RAUC_CONF_OPT	:= \
 	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
 	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
 	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
+	-Dfuzzing=false \
 	-Dgpt=disabled \
+	-Dhtmldocs=false \
 	-Djson=disabled \
 	-Dmanpages=false \
 	-Dnetwork=false \
@@ -34,6 +36,7 @@ HOST_RAUC_CONF_OPT	:= \
 	-Dservice=false \
 	-Dstreaming=false \
 	-Dstreaming_user=nobody \
+	-Dsystemdcatalogdir=/usr/lib/systemd/catalog \
 	-Dsystemdunitdir=/usr/lib/systemd/system \
 	-Dtests=false
 
-- 
2.47.3

Re: [ptxdist] [APPLIED] composefs: sort meson options

[Michael Olbrich]

Thanks, applied as 4e373a8043dda4c14e993592972e3cc191021f2b.

Michael

[sent from post-receive hook]

On Fri, 14 Aug 2026 09:41:04 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Sort the meson options to match the sorting of the configure_helper.py
> helper script.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260715073140.2795953-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/composefs.make b/rules/composefs.make
> index c477249bde2b..d44f2a1e3acb 100644
> --- a/rules/composefs.make
> +++ b/rules/composefs.make
> @@ -39,8 +39,8 @@ COMPOSEFS_LICENSE_FILES	:= \
>  COMPOSEFS_CONF_TOOL	:= meson
>  COMPOSEFS_CONF_OPT	:= \
>  	$(CROSS_MESON_USR) \
> -	-Dman=disabled \
> -	-Dfuse=disabled
> +	-Dfuse=disabled \
> +	-Dman=disabled
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

Re: [ptxdist] [APPLIED] host-composefs: new host package

[Michael Olbrich]

Thanks, applied as 243e37e07a879ddb67082b6c95adb43e5ca74e42.

Michael

[sent from post-receive hook]

On Fri, 14 Aug 2026 09:41:06 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> New host package based on the already existing rules for the target
> package.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260715073140.2795953-2-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-composefs.in b/rules/host-composefs.in
> new file mode 100644
> index 000000000000..1d9375db5edb
> --- /dev/null
> +++ b/rules/host-composefs.in
> @@ -0,0 +1,7 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_COMPOSEFS
> +	tristate
> +	default y if ALLYES
> +	select HOST_MESON
> +	select HOST_OPENSSL
> diff --git a/rules/host-composefs.make b/rules/host-composefs.make
> new file mode 100644
> index 000000000000..3567d6fd0065
> --- /dev/null
> +++ b/rules/host-composefs.make
> @@ -0,0 +1,27 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2026 by Sven Püschel <s.pueschel@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_COMPOSEFS) += host-composefs
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# meson
> +#
> +HOST_COMPOSEFS_CONF_TOOL	:= meson
> +HOST_COMPOSEFS_CONF_OPT		:= \
> +	$(HOST_MESON_OPT) \
> +	-Dfuse=disabled \
> +	-Dman=disabled
> +
> +# vim: syntax=make

Re: [ptxdist] [APPLIED] host-rauc: use the correct build system options

[Michael Olbrich]

Thanks, applied as 07cc935e7f26ce4c44ca9a50e3332163c6a9ab62.

Michael

[sent from post-receive hook]

On Fri, 14 Aug 2026 09:41:06 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> While migrating from autoconf to meson, the host options
> variable was missed. Adjust it to not mix build system options.
> 
> Fixes: 6e72460fe797 ("rauc: migrate to meson")
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260715073140.2795953-3-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index b0d3989006d9..2d4e1775260c 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -20,7 +20,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
>  #
>  HOST_RAUC_CONF_TOOL	:= meson
>  HOST_RAUC_CONF_OPT	:= \
> -	$(HOST_AUTOCONF) \
> +	$(HOST_MESON_OPT) \
>  	-Dcreate=true \
>  	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
>  	-Ddbuspolicydir=/usr/share/dbus-1/system.d \

Re: [ptxdist] [APPLIED] host-rauc: enable composefs support

[Michael Olbrich]

Thanks, applied as a69ea2e1cc2a749dd1b06de69b1c23a93129b041.

Michael

[sent from post-receive hook]

On Fri, 14 Aug 2026 09:41:07 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Unconditionally enable composefs support in the host RAUC package,
> as the required composefs dependency is rather small.
> This allows the host RAUC to also utilize composefs for artifacts
> in update bundles.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260715073140.2795953-4-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-rauc.in b/rules/host-rauc.in
> index 0dddc742d03e..bc05d05c87dd 100644
> --- a/rules/host-rauc.in
> +++ b/rules/host-rauc.in
> @@ -3,6 +3,7 @@
>  config HOST_RAUC
>  	tristate
>  	default y if ALLYES
> +	select HOST_COMPOSEFS
>  	select HOST_GLIB
>  	select HOST_MESON
>  	select HOST_OPENSSL
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index 2d4e1775260c..40f9f436ccbf 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -21,6 +21,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
>  HOST_RAUC_CONF_TOOL	:= meson
>  HOST_RAUC_CONF_OPT	:= \
>  	$(HOST_MESON_OPT) \
> +	-Dcomposefs=enabled \
>  	-Dcreate=true \
>  	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
>  	-Ddbuspolicydir=/usr/share/dbus-1/system.d \

Re: [ptxdist] [APPLIED] host-rauc: add missing options

[Michael Olbrich]

Thanks, applied as af7fe92c6398143ffbb7dfb75ae1e6de092cd15c.

Michael

[sent from post-receive hook]

On Fri, 14 Aug 2026 09:41:08 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Add missing options based on the configure_helper.py script output.
> The option values were copied from the rauc.make file for the target.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260715073140.2795953-5-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index 40f9f436ccbf..8b5279b33a5d 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -26,7 +26,9 @@ HOST_RAUC_CONF_OPT	:= \
>  	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
>  	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
>  	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> +	-Dfuzzing=false \
>  	-Dgpt=disabled \
> +	-Dhtmldocs=false \
>  	-Djson=disabled \
>  	-Dmanpages=false \
>  	-Dnetwork=false \
> @@ -34,6 +36,7 @@ HOST_RAUC_CONF_OPT	:= \
>  	-Dservice=false \
>  	-Dstreaming=false \
>  	-Dstreaming_user=nobody \
> +	-Dsystemdcatalogdir=/usr/lib/systemd/catalog \
>  	-Dsystemdunitdir=/usr/lib/systemd/system \
>  	-Dtests=false
>