[ptxdist] [PATCH v2 1/2] composefs: new package

[ptxdist] [PATCH v2 1/2] composefs: new package

[Bruno Thomsen]

Optional dependency for rauc.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
v1-v2:
Forgot to add new composefs package as dependency

 rules/composefs.in   |  8 ++++++
 rules/composefs.make | 67 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 rules/composefs.in
 create mode 100644 rules/composefs.make

diff --git a/rules/composefs.in b/rules/composefs.in
new file mode 100644
index 000000000..b3d6020ee
--- /dev/null
+++ b/rules/composefs.in
@@ -0,0 +1,8 @@
+## SECTION=disk_and_file
+
+config COMPOSEFS
+	bool
+	prompt "composefs"
+	select HOST_MESON
+	help
+	  A file system for mounting container images
diff --git a/rules/composefs.make b/rules/composefs.make
new file mode 100644
index 000000000..67fc71803
--- /dev/null
+++ b/rules/composefs.make
@@ -0,0 +1,67 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2025 by Bruno Thomsen <bruno.thomsen@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_COMPOSEFS) += composefs
+
+#
+# Paths and names
+#
+COMPOSEFS_VERSION	:= 1.0.8
+COMPOSEFS_MD5		:= 6f4714015bcfdd9c79b215c49da41b26
+COMPOSEFS		:= composefs-$(COMPOSEFS_VERSION)
+COMPOSEFS_SUFFIX	:= tar.xz
+COMPOSEFS_URL		:= https://github.com/composefs/composefs/releases/download/v$(COMPOSEFS_VERSION)/$(COMPOSEFS).$(COMPOSEFS_SUFFIX)
+COMPOSEFS_SOURCE	:= $(SRCDIR)/$(COMPOSEFS).$(COMPOSEFS_SUFFIX)
+COMPOSEFS_DIR		:= $(BUILDDIR)/$(COMPOSEFS)
+COMPOSEFS_LICENSE	:= (GPL-2.0-or-later OR Apache-2.0) AND LGPL-2.1-or-later
+COMPOSEFS_LICENSE_FILES	:= \
+	file://COPYING;md5=5cbca48090f7fe0169186a551a5bf78c \
+	file://COPYING.GPL-2.0-only;md5=94fa01670a2a8f2d3ab2de15004e0848 \
+	file://COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
+	file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+COMPOSEFS_CONF_TOOL	:= meson
+COMPOSEFS_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-Dman=disabled \
+	-Dfuse=disabled
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/composefs.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, composefs)
+	@$(call install_fixup, composefs, PRIORITY, optional)
+	@$(call install_fixup, composefs, SECTION, base)
+	@$(call install_fixup, composefs, AUTHOR, "Bruno Thomsen <bruno.thomsen@gmail.com>")
+	@$(call install_fixup, composefs, DESCRIPTION, missing)
+
+	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/bin/mkcomposefs)
+	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/bin/composefs-info)
+	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/sbin/mount.composefs)
+	@$(call install_lib, composefs, 0, 0, 0644, libcomposefs)
+
+	@$(call install_finish, composefs)
+
+	@$(call touch)
+
+# vim: syntax=make

base-commit: 51f6fea554acb994e4f082af28077e82aab221cc
-- 
2.50.0

[ptxdist] [PATCH v2 2/2] rauc: version bump 1.13 -> 1.14

[Bruno Thomsen]

Make new composefs option configurable in menu.

Changelog: https://github.com/rauc/rauc/releases/tag/v1.14

License section in README.rst has updated year.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
v1-v2:
License hash changed after year bump.
Add missing composefs dependency.

 rules/rauc.in   | 8 ++++++++
 rules/rauc.make | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/rules/rauc.in b/rules/rauc.in
index ee9c3f955..ed951db02 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -12,6 +12,7 @@ menuconfig RAUC
 	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
 	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
 	select BUSYBOX_FEATURE_SEAMLESS_GZ	if BUSYBOX_TAR
+	select COMPOSEFS			if RAUC_COMPOSEFS
 	select DBUS				if RAUC_SERVICE
 	select LIBCURL				if RAUC_NETWORK
 	select LIBNL3				if RAUC_STREAMING
@@ -80,6 +81,13 @@ config RAUC_GPT
 	  For details, see
 	  https://rauc.readthedocs.io/en/latest/advanced.html#update-boot-partition-in-gpt
 
+config RAUC_COMPOSEFS
+	bool
+	prompt "Enable composefs support"
+	help
+	  Enables support for creating composefs artifact repository.
+	  For details, see
+	  https://rauc.readthedocs.io/en/latest/integration.html#repository-type
 
 config RAUC_CONFIGURATION
 	bool
diff --git a/rules/rauc.make b/rules/rauc.make
index 9a8671c32..a3a5071e5 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION		:= 1.13
-RAUC_MD5		:= cb740d131e2e831810407f2d39d373dd
+RAUC_VERSION		:= 1.14
+RAUC_MD5		:= a99bac2e1a6bf26d75c6427b5e994e7f
 RAUC			:= rauc-$(RAUC_VERSION)
 RAUC_SUFFIX		:= tar.xz
 RAUC_URL		:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
@@ -23,7 +23,7 @@ RAUC_SOURCE		:= $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
 RAUC_DIR		:= $(BUILDDIR)/$(RAUC)
 RAUC_LICENSE		:= LGPL-2.1-or-later
 RAUC_LICENSE_FILES	:= \
-	file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
+	file://README.rst;startline=281;endline=294;md5=340a79569c116c7f0439677b0a9fd6c3 \
 	file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
@@ -43,6 +43,7 @@ RAUC_CONF_OPT	:= \
 	-Dsystemdcatalogdir=/usr/lib/systemd/catalog \
 	-Dfuzzing=false \
 	-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
+	-Dcomposefs=$(call ptx/endis,PTXCONF_RAUC_COMPOSEFS)d \
 	-Dhtmldocs=false \
 	-Djson=$(call ptx/endis,PTXCONF_RAUC_JSON)d \
 	-Dnetwork=$(call ptx/truefalse,PTXCONF_RAUC_NETWORK) \
-- 
2.50.0

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

[Michael Olbrich]

Thanks, applied as f1ca21ed6f167a7fab61cb13ca563332310e1d9a.

Michael

[sent from post-receive hook]

On Sat, 12 Jul 2025 17:48:28 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Optional dependency for rauc.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20250707155838.5284-1-bruno.thomsen@gmail.com>
> [mol: add missing dependency on openssl]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/composefs.in b/rules/composefs.in
> new file mode 100644
> index 000000000000..82db1a7fbe66
> --- /dev/null
> +++ b/rules/composefs.in
> @@ -0,0 +1,9 @@
> +## SECTION=disk_and_file
> +
> +config COMPOSEFS
> +	bool
> +	prompt "composefs"
> +	select HOST_MESON
> +	select OPENSSL
> +	help
> +	  A file system for mounting container images
> diff --git a/rules/composefs.make b/rules/composefs.make
> new file mode 100644
> index 000000000000..67fc71803759
> --- /dev/null
> +++ b/rules/composefs.make
> @@ -0,0 +1,67 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2025 by Bruno Thomsen <bruno.thomsen@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_COMPOSEFS) += composefs
> +
> +#
> +# Paths and names
> +#
> +COMPOSEFS_VERSION	:= 1.0.8
> +COMPOSEFS_MD5		:= 6f4714015bcfdd9c79b215c49da41b26
> +COMPOSEFS		:= composefs-$(COMPOSEFS_VERSION)
> +COMPOSEFS_SUFFIX	:= tar.xz
> +COMPOSEFS_URL		:= https://github.com/composefs/composefs/releases/download/v$(COMPOSEFS_VERSION)/$(COMPOSEFS).$(COMPOSEFS_SUFFIX)
> +COMPOSEFS_SOURCE	:= $(SRCDIR)/$(COMPOSEFS).$(COMPOSEFS_SUFFIX)
> +COMPOSEFS_DIR		:= $(BUILDDIR)/$(COMPOSEFS)
> +COMPOSEFS_LICENSE	:= (GPL-2.0-or-later OR Apache-2.0) AND LGPL-2.1-or-later
> +COMPOSEFS_LICENSE_FILES	:= \
> +	file://COPYING;md5=5cbca48090f7fe0169186a551a5bf78c \
> +	file://COPYING.GPL-2.0-only;md5=94fa01670a2a8f2d3ab2de15004e0848 \
> +	file://COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
> +	file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# meson
> +#
> +COMPOSEFS_CONF_TOOL	:= meson
> +COMPOSEFS_CONF_OPT	:= \
> +	$(CROSS_MESON_USR) \
> +	-Dman=disabled \
> +	-Dfuse=disabled
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/composefs.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, composefs)
> +	@$(call install_fixup, composefs, PRIORITY, optional)
> +	@$(call install_fixup, composefs, SECTION, base)
> +	@$(call install_fixup, composefs, AUTHOR, "Bruno Thomsen <bruno.thomsen@gmail.com>")
> +	@$(call install_fixup, composefs, DESCRIPTION, missing)
> +
> +	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/bin/mkcomposefs)
> +	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/bin/composefs-info)
> +	@$(call install_copy, composefs, 0, 0, 0755, -, /usr/sbin/mount.composefs)
> +	@$(call install_lib, composefs, 0, 0, 0644, libcomposefs)
> +
> +	@$(call install_finish, composefs)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

Re: [ptxdist] [APPLIED] rauc: version bump 1.13 -> 1.14

[Michael Olbrich]

Thanks, applied as c25dced5240221a8320ae6265ef21de88f45baa0.

Michael

[sent from post-receive hook]

On Sat, 12 Jul 2025 17:48:28 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Make new composefs option configurable in menu.
> 
> Changelog: https://github.com/rauc/rauc/releases/tag/v1.14
> 
> License section in README.rst has updated year.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20250707155838.5284-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rauc.in b/rules/rauc.in
> index ee9c3f955b79..ed951db024b9 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -12,6 +12,7 @@ menuconfig RAUC
>  	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
>  	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
>  	select BUSYBOX_FEATURE_SEAMLESS_GZ	if BUSYBOX_TAR
> +	select COMPOSEFS			if RAUC_COMPOSEFS
>  	select DBUS				if RAUC_SERVICE
>  	select LIBCURL				if RAUC_NETWORK
>  	select LIBNL3				if RAUC_STREAMING
> @@ -80,6 +81,13 @@ config RAUC_GPT
>  	  For details, see
>  	  https://rauc.readthedocs.io/en/latest/advanced.html#update-boot-partition-in-gpt
>  
> +config RAUC_COMPOSEFS
> +	bool
> +	prompt "Enable composefs support"
> +	help
> +	  Enables support for creating composefs artifact repository.
> +	  For details, see
> +	  https://rauc.readthedocs.io/en/latest/integration.html#repository-type
>  
>  config RAUC_CONFIGURATION
>  	bool
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 9a8671c32d3c..a3a5071e5297 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
>  #
>  # Paths and names
>  #
> -RAUC_VERSION		:= 1.13
> -RAUC_MD5		:= cb740d131e2e831810407f2d39d373dd
> +RAUC_VERSION		:= 1.14
> +RAUC_MD5		:= a99bac2e1a6bf26d75c6427b5e994e7f
>  RAUC			:= rauc-$(RAUC_VERSION)
>  RAUC_SUFFIX		:= tar.xz
>  RAUC_URL		:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> @@ -23,7 +23,7 @@ RAUC_SOURCE		:= $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
>  RAUC_DIR		:= $(BUILDDIR)/$(RAUC)
>  RAUC_LICENSE		:= LGPL-2.1-or-later
>  RAUC_LICENSE_FILES	:= \
> -	file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
> +	file://README.rst;startline=281;endline=294;md5=340a79569c116c7f0439677b0a9fd6c3 \
>  	file://COPYING;md5=4fbd65380cdd255951079008b364516c
>  
>  # ----------------------------------------------------------------------------
> @@ -43,6 +43,7 @@ RAUC_CONF_OPT	:= \
>  	-Dsystemdcatalogdir=/usr/lib/systemd/catalog \
>  	-Dfuzzing=false \
>  	-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> +	-Dcomposefs=$(call ptx/endis,PTXCONF_RAUC_COMPOSEFS)d \
>  	-Dhtmldocs=false \
>  	-Djson=$(call ptx/endis,PTXCONF_RAUC_JSON)d \
>  	-Dnetwork=$(call ptx/truefalse,PTXCONF_RAUC_NETWORK) \