* [ptxdist] [RFC PATCH 1/7] libubootenv: Introduce new package
[not found] <20250321085246.21344-1-ada@thorsis.com>
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 2/7] libubootenv: Add option for installing tools Alexander Dahl via ptxdist
` (5 subsequent siblings)
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 5207 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 1/7] libubootenv: Introduce new package
Date: Fri, 21 Mar 2025 09:52:40 +0100
Message-ID: <20250321085246.21344-2-ada@thorsis.com>
Maybe useful to replace u-boot-tools.
Requirement for the upcoming swupdate package.
Link: https://github.com/sbabic/libubootenv
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libubootenv.in | 15 +++++++++++
rules/libubootenv.make | 58 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
create mode 100644 rules/libubootenv.in
create mode 100644 rules/libubootenv.make
diff --git a/rules/libubootenv.in b/rules/libubootenv.in
new file mode 100644
index 000000000..70f6d9863
--- /dev/null
+++ b/rules/libubootenv.in
@@ -0,0 +1,15 @@
+## SECTION=system_libraries
+
+config LIBUBOOTENV
+ tristate
+ select HOST_CMAKE
+ select LIBYAML
+ select ZLIB
+ prompt "libubootenv"
+ help
+ Generic library and tools to access and modify U-Boot
+ environment from User Space.
+
+ https://github.com/sbabic/libubootenv
+
+# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/libubootenv.make b/rules/libubootenv.make
new file mode 100644
index 000000000..d4e678152
--- /dev/null
+++ b/rules/libubootenv.make
@@ -0,0 +1,58 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2025 by Alexander Dahl <ada@thorsis.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBUBOOTENV) += libubootenv
+
+#
+# Paths and names
+#
+LIBUBOOTENV_VERSION := 0.3.6
+LIBUBOOTENV_MD5 := 7d6b623e8da435cf36e7fcd419a03e43
+LIBUBOOTENV := libubootenv-$(LIBUBOOTENV_VERSION)
+LIBUBOOTENV_SUFFIX := tar.gz
+LIBUBOOTENV_URL := https://github.com/sbabic/libubootenv/archive/refs/tags/v$(LIBUBOOTENV_VERSION).$(LIBUBOOTENV_SUFFIX)
+LIBUBOOTENV_SOURCE := $(SRCDIR)/$(LIBUBOOTENV).$(LIBUBOOTENV_SUFFIX)
+LIBUBOOTENV_DIR := $(BUILDDIR)/$(LIBUBOOTENV)
+LIBUBOOTENV_LICENSE := MIT AND CC0-1.0 AND LGPL-2.1-or-later
+LIBUBOOTENV_LICENSE_FILES := \
+ file://LICENSES/MIT.txt;md5=838c366f69b72c5df05c96dff79b35f2 \
+ file://LICENSES/CC0-1.0.txt;md5=0ceb3372c9595f0a8067e55da801e4a1 \
+ file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBUBOOTENV_CONF_TOOL := cmake
+LIBUBOOTENV_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DBUILD_DOC=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libubootenv.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libubootenv)
+ @$(call install_fixup, libubootenv,PRIORITY,optional)
+ @$(call install_fixup, libubootenv,SECTION,base)
+ @$(call install_fixup, libubootenv,AUTHOR,"Alexander Dahl <ada@thorsis.com>")
+ @$(call install_fixup, libubootenv,DESCRIPTION,missing)
+
+ @$(call install_lib, libubootenv, 0, 0, 0644, libubootenv)
+
+ @$(call install_finish, libubootenv)
+
+ @$(call touch)
+
+# vim: ft=make noet tw=72 ts=8 sw=8
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 2/7] libubootenv: Add option for installing tools
[not found] <20250321085246.21344-1-ada@thorsis.com>
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 1/7] libubootenv: Introduce new package Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 3/7] swupdate: Introduce new package Alexander Dahl via ptxdist
` (4 subsequent siblings)
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 3934 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 2/7] libubootenv: Add option for installing tools
Date: Fri, 21 Mar 2025 09:52:41 +0100
Message-ID: <20250321085246.21344-3-ada@thorsis.com>
These tools can also be provided by the u-boot-tools package. This
variant promises to be board independent, and comes with a library.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libubootenv.in | 18 ++++++++++++++++--
rules/libubootenv.make | 7 +++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/rules/libubootenv.in b/rules/libubootenv.in
index 70f6d9863..317a440fc 100644
--- a/rules/libubootenv.in
+++ b/rules/libubootenv.in
@@ -1,15 +1,29 @@
## SECTION=system_libraries
-config LIBUBOOTENV
+menuconfig LIBUBOOTENV
tristate
select HOST_CMAKE
select LIBYAML
select ZLIB
- prompt "libubootenv"
+ prompt "libubootenv "
help
Generic library and tools to access and modify U-Boot
environment from User Space.
https://github.com/sbabic/libubootenv
+if LIBUBOOTENV
+
+config LIBUBOOTENV_TOOLS
+ bool
+ prompt "fw_printenv / fw_setenv"
+ depends on !U_BOOT_TOOLS || ALLYES
+ help
+ Install fw_printenv and fw_setenv to target.
+
+comment "u-boot-tools is selected!"
+ depends on U_BOOT_TOOLS
+
+endif
+
# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/libubootenv.make b/rules/libubootenv.make
index d4e678152..769961dfa 100644
--- a/rules/libubootenv.make
+++ b/rules/libubootenv.make
@@ -51,6 +51,13 @@ $(STATEDIR)/libubootenv.targetinstall:
@$(call install_lib, libubootenv, 0, 0, 0644, libubootenv)
+ifdef PTXCONF_LIBUBOOTENV_TOOLS
+# # same path as the equivalents from u-boot-tools package
+ @$(call install_copy, libubootenv, 0, 0, 0755, \
+ $(LIBUBOOTENV_PKGDIR)/usr/bin/fw_printenv, /usr/sbin/fw_printenv)
+ @$(call install_link, libubootenv, fw_printenv, /usr/sbin/fw_setenv)
+endif
+
@$(call install_finish, libubootenv)
@$(call touch)
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 3/7] swupdate: Introduce new package
[not found] <20250321085246.21344-1-ada@thorsis.com>
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 1/7] libubootenv: Introduce new package Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 2/7] libubootenv: Add option for installing tools Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 4/7] swupdate: Remove targetinstall of example tools Alexander Dahl via ptxdist
` (3 subsequent siblings)
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 7999 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 3/7] swupdate: Introduce new package
Date: Fri, 21 Mar 2025 09:52:42 +0100
Message-ID: <20250321085246.21344-4-ada@thorsis.com>
Minimal solution, not considering all the options which can be set
through Kconfig.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/swupdate.in | 17 ++++++
rules/swupdate.make | 144 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 161 insertions(+)
create mode 100644 rules/swupdate.in
create mode 100644 rules/swupdate.make
diff --git a/rules/swupdate.in b/rules/swupdate.in
new file mode 100644
index 000000000..2fc4f6627
--- /dev/null
+++ b/rules/swupdate.in
@@ -0,0 +1,17 @@
+## SECTION=applications
+
+config SWUPDATE
+ tristate
+ select LIBUBOOTENV
+ select JSON_C
+ prompt "swupdate"
+ help
+ SWUpdate is a Linux Update agent with the goal to provide an
+ efficient and safe way to update an embedded Linux system in
+ field.
+ SWUpdate supports local and OTA updates, multiple update
+ strategies and it is designed with security in mind.
+
+ https://swupdate.org/
+
+# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/swupdate.make b/rules/swupdate.make
new file mode 100644
index 000000000..3f8fa13b5
--- /dev/null
+++ b/rules/swupdate.make
@@ -0,0 +1,144 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2025 by Alexander Dahl <ada@thorsis.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SWUPDATE) += swupdate
+
+#
+# Paths and names
+#
+SWUPDATE_VERSION := 2024.12.1
+SWUPDATE_MD5 := ce7ef65f99840d0b0e724a6d96c17430
+SWUPDATE := swupdate-$(SWUPDATE_VERSION)
+SWUPDATE_SUFFIX := tar.gz
+SWUPDATE_URL := https://github.com/sbabic/swupdate/archive/refs/tags/$(SWUPDATE_VERSION).$(SWUPDATE_SUFFIX)
+SWUPDATE_SOURCE := $(SRCDIR)/$(SWUPDATE).$(SWUPDATE_SUFFIX)
+SWUPDATE_DIR := $(BUILDDIR)/$(SWUPDATE)
+SWUPDATE_BUILD_DIR := $(SWUPDATE_DIR)-build
+SWUPDATE_BUILD_OOT := KEEP
+SWUPDATE_LICENSE := \
+ BSD-1-Clause AND BSD-3-Clause AND CC-BY-SA-4.0 AND CC0-1.0 AND \
+ GPL-2.0-only AND GPL-2.0-or-later AND ISC AND \
+ LGPL-2.1-or-later AND MIT AND OFL-1.1
+SWUPDATE_LICENSE_FILES := \
+ file://LICENSES/BSD-1-Clause.txt;md5=4c75b3902cf6a01969906bcae9cf8cd6 \
+ file://LICENSES/BSD-3-Clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+ file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
+ file://LICENSES/CC0-1.0.txt;md5=0ceb3372c9595f0a8067e55da801e4a1 \
+ file://LICENSES/GPL-2.0-only.txt;md5=4ee23c52855c222cba72583d301d2338 \
+ file://LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
+ file://LICENSES/ISC.txt;md5=a6fd9988b21ff227cdfb961fd4b23ba4 \
+ file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c \
+ file://LICENSES/MIT.txt;md5=838c366f69b72c5df05c96dff79b35f2 \
+ file://LICENSES/OFL-1.1.txt;md5=7a75f82b54b8af9107d35c6d3cab23ac
+
+SWUPDATE_CONFIG := $(or \
+ $(call ptx/in-path, PTXDIST_PATH_LAYERS, configs/swupdate.config), \
+ $(PTXDIST_WORKSPACE)/configs/swupdate.config)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+SWUPDATE_CONF_TOOL := kconfig
+
+SWUPDATE_CONF_ENV := \
+ HAVE_FREEBSD=n \
+ HAVE_LINUX=y \
+ HAVE_LUA=n \
+ HAVE_LIBCONFIG=n \
+ HAVE_LIBARCHIVE=n \
+ HAVE_LIBCURL=n \
+ HAVE_LIBFDISK=n \
+ HAVE_LIBBLKID=n \
+ HAVE_LIBGPIOD=n \
+ HAVE_LIBMTD=n \
+ HAVE_LIBUBI=n \
+ HAVE_LIBUBOOTENV=n \
+ HAVE_LIBEBGENV=n \
+ HAVE_LIBTEGRABOOT_TOOLS=n \
+ HAVE_LIBZEROMQ=n \
+ HAVE_ZLIB=n \
+ HAVE_ZSTD=n \
+ HAVE_LIBEXT2FS=n \
+ HAVE_LIBBTRFS=n \
+ HAVE_LIBSSL=n \
+ HAVE_LIBSYSTEMD=n \
+ HAVE_LIBCRYPTO=n \
+ HAVE_WOLFSSL=n \
+ HAVE_MBEDTLS=n \
+ HAVE_P11KIT=n \
+ HAVE_LIBWEBSOCKETS=n \
+ HAVE_LIBRSYNC=n \
+ HAVE_URIPARSER=n \
+ HAVE_ZCK=n
+
+SWUPDATE_CONF_OPT := \
+ -C $(SWUPDATE_DIR) \
+ O=$(SWUPDATE_BUILD_DIR) \
+ V=$(PTXDIST_VERBOSE)
+
+SWUPDATE_MAKE_ENV := \
+ $(SWUPDATE_CONF_ENV) \
+ CROSS_COMPILE=$(COMPILER_PREFIX) \
+ CC=$(CROSS_CC) \
+ LD=$(CROSS_CC) \
+ SKIP_STRIP=y
+
+SWUPDATE_MAKE_OPT := \
+ $(SWUPDATE_CONF_OPT) \
+ SWU_VER="$(SWUPDATE_VERSION) (PTXdist $(PTXDIST_VERSION_FULL))"
+
+SWUPDATE_INSTALL_OPT := \
+ $(SWUPDATE_MAKE_OPT) \
+ install
+
+ifdef PTXCONF_SWUPDATE
+$(SWUPDATE_CONFIG):
+ @echo
+ @echo "******************************************************************************"
+ @echo "**** Please generate a swupdate config with 'ptxdist menuconfig swupdate' ****"
+ @echo "******************************************************************************"
+ @echo
+ @echo
+ @exit 1
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/swupdate.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, swupdate)
+ @$(call install_fixup, swupdate,PRIORITY,optional)
+ @$(call install_fixup, swupdate,SECTION,base)
+ @$(call install_fixup, swupdate,AUTHOR,"Alexander Dahl <ada@thorsis.com>")
+ @$(call install_fixup, swupdate,DESCRIPTION,missing)
+
+ @$(call install_lib, swupdate, 0, 0, 0644, libswupdate)
+ @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate)
+ @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-client)
+ @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-ipc)
+ @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-progress)
+
+ @$(call install_finish, swupdate)
+
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# oldconfig / menuconfig
+# ----------------------------------------------------------------------------
+
+$(call ptx/kconfig-targets, swupdate): $(STATEDIR)/swupdate.extract
+ @$(call world/kconfig, SWUPDATE, $(subst swupdate_,,$@))
+
+# vim: ft=make noet tw=72 ts=8 sw=8
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 4/7] swupdate: Remove targetinstall of example tools
[not found] <20250321085246.21344-1-ada@thorsis.com>
` (2 preceding siblings ...)
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 3/7] swupdate: Introduce new package Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 5/7] swupdate: Add option to build with OpenSSL support Alexander Dahl via ptxdist
` (2 subsequent siblings)
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 2931 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 4/7] swupdate: Remove targetinstall of example tools
Date: Fri, 21 Mar 2025 09:52:43 +0100
Message-ID: <20250321085246.21344-5-ada@thorsis.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/swupdate.make | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rules/swupdate.make b/rules/swupdate.make
index 3f8fa13b5..ef6e8711f 100644
--- a/rules/swupdate.make
+++ b/rules/swupdate.make
@@ -126,9 +126,6 @@ $(STATEDIR)/swupdate.targetinstall:
@$(call install_lib, swupdate, 0, 0, 0644, libswupdate)
@$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate)
- @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-client)
- @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-ipc)
- @$(call install_copy, swupdate, 0, 0, 0755, -, /usr/bin/swupdate-progress)
@$(call install_finish, swupdate)
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 5/7] swupdate: Add option to build with OpenSSL support
[not found] <20250321085246.21344-1-ada@thorsis.com>
` (3 preceding siblings ...)
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 4/7] swupdate: Remove targetinstall of example tools Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 6/7] swupdate: Fix passing libubootenv dependency Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 7/7] swupdate: Add optional zlib support Alexander Dahl via ptxdist
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 3692 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 5/7] swupdate: Add option to build with OpenSSL support
Date: Fri, 21 Mar 2025 09:52:44 +0100
Message-ID: <20250321085246.21344-6-ada@thorsis.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/swupdate.in | 16 ++++++++++++++--
rules/swupdate.make | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/rules/swupdate.in b/rules/swupdate.in
index 2fc4f6627..d4eab8402 100644
--- a/rules/swupdate.in
+++ b/rules/swupdate.in
@@ -1,10 +1,11 @@
## SECTION=applications
-config SWUPDATE
+menuconfig SWUPDATE
tristate
select LIBUBOOTENV
select JSON_C
- prompt "swupdate"
+ select OPENSSL if SWUPDATE_WITH_OPENSSL
+ prompt "swupdate "
help
SWUpdate is a Linux Update agent with the goal to provide an
efficient and safe way to update an embedded Linux system in
@@ -14,4 +15,15 @@ config SWUPDATE
https://swupdate.org/
+if SWUPDATE
+
+config SWUPDATE_WITH_OPENSSL
+ bool
+ prompt "OpenSSL support"
+ help
+ Allows to enable hash verification, signed image verification,
+ image encryption, and https for embedded webserver.
+
+endif
+
# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/swupdate.make b/rules/swupdate.make
index ef6e8711f..bcd109f05 100644
--- a/rules/swupdate.make
+++ b/rules/swupdate.make
@@ -69,9 +69,9 @@ SWUPDATE_CONF_ENV := \
HAVE_ZSTD=n \
HAVE_LIBEXT2FS=n \
HAVE_LIBBTRFS=n \
- HAVE_LIBSSL=n \
+ HAVE_LIBSSL=$(call ptx/ifdef, PTXCONF_SWUPDATE_WITH_OPENSSL, y, n) \
HAVE_LIBSYSTEMD=n \
- HAVE_LIBCRYPTO=n \
+ HAVE_LIBCRYPTO=$(call ptx/ifdef, PTXCONF_SWUPDATE_WITH_OPENSSL, y, n) \
HAVE_WOLFSSL=n \
HAVE_MBEDTLS=n \
HAVE_P11KIT=n \
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 6/7] swupdate: Fix passing libubootenv dependency
[not found] <20250321085246.21344-1-ada@thorsis.com>
` (4 preceding siblings ...)
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 5/7] swupdate: Add option to build with OpenSSL support Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 7/7] swupdate: Add optional zlib support Alexander Dahl via ptxdist
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 2804 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 6/7] swupdate: Fix passing libubootenv dependency
Date: Fri, 21 Mar 2025 09:52:45 +0100
Message-ID: <20250321085246.21344-7-ada@thorsis.com>
That library is used unconditionally, so we can set that symbol to y.
Link: https://groups.google.com/g/swupdate/c/T6i5EF-K_X4/m/_py9SoW3AQAJ
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/swupdate.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/swupdate.make b/rules/swupdate.make
index bcd109f05..5cf64a646 100644
--- a/rules/swupdate.make
+++ b/rules/swupdate.make
@@ -61,7 +61,7 @@ SWUPDATE_CONF_ENV := \
HAVE_LIBGPIOD=n \
HAVE_LIBMTD=n \
HAVE_LIBUBI=n \
- HAVE_LIBUBOOTENV=n \
+ HAVE_LIBUBOOTENV=y \
HAVE_LIBEBGENV=n \
HAVE_LIBTEGRABOOT_TOOLS=n \
HAVE_LIBZEROMQ=n \
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [RFC PATCH 7/7] swupdate: Add optional zlib support
[not found] <20250321085246.21344-1-ada@thorsis.com>
` (5 preceding siblings ...)
2025-03-21 8:52 ` [ptxdist] [RFC PATCH 6/7] swupdate: Fix passing libubootenv dependency Alexander Dahl via ptxdist
@ 2025-03-21 8:52 ` Alexander Dahl via ptxdist
6 siblings, 0 replies; 7+ messages in thread
From: Alexander Dahl via ptxdist @ 2025-03-21 8:52 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
[-- Attachment #0: Type: message/rfc822, Size: 3514 bytes --]
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [RFC PATCH 7/7] swupdate: Add optional zlib support
Date: Fri, 21 Mar 2025 09:52:46 +0100
Message-ID: <20250321085246.21344-8-ada@thorsis.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/swupdate.in | 7 +++++++
rules/swupdate.make | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/rules/swupdate.in b/rules/swupdate.in
index d4eab8402..1e6a9aad3 100644
--- a/rules/swupdate.in
+++ b/rules/swupdate.in
@@ -5,6 +5,7 @@ menuconfig SWUPDATE
select LIBUBOOTENV
select JSON_C
select OPENSSL if SWUPDATE_WITH_OPENSSL
+ select ZLIB if SWUPDATE_WITH_ZLIB
prompt "swupdate "
help
SWUpdate is a Linux Update agent with the goal to provide an
@@ -24,6 +25,12 @@ config SWUPDATE_WITH_OPENSSL
Allows to enable hash verification, signed image verification,
image encryption, and https for embedded webserver.
+config SWUPDATE_WITH_ZLIB
+ bool
+ prompt "zlib support"
+ help
+ Allow decompressing of zlib/gz compressed streams.
+
endif
# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/swupdate.make b/rules/swupdate.make
index 5cf64a646..e4ca08be6 100644
--- a/rules/swupdate.make
+++ b/rules/swupdate.make
@@ -65,7 +65,7 @@ SWUPDATE_CONF_ENV := \
HAVE_LIBEBGENV=n \
HAVE_LIBTEGRABOOT_TOOLS=n \
HAVE_LIBZEROMQ=n \
- HAVE_ZLIB=n \
+ HAVE_ZLIB=$(call ptx/ifdef, PTXCONF_SWUPDATE_WITH_ZLIB, y, n) \
HAVE_ZSTD=n \
HAVE_LIBEXT2FS=n \
HAVE_LIBBTRFS=n \
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread