* [Buildroot] [PATCH v2 1/1] package/swupdate: add embedded lua handler config option
@ 2023-09-19 4:22 James Hilliard
2026-11-21 16:50 ` [Buildroot] [PATCH v3] " Angelo Compagnucci
0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2023-09-19 4:22 UTC (permalink / raw)
To: buildroot; +Cc: James Hilliard
We are able to configure most swupdate options using a swupdate
config file, however the embedded lua source option may need to point
to a buildroot generated source path.
To simplify configuration of this swupdate option add a buildroot
config option which will pass a source file path to swupdate when
enabled in buildroot. We also need a config option to enable this
feature in swupdate which the source file path config option will
depend on.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes v1 -> v2:
- pass path via make opts instead of kconfig
---
package/swupdate/Config.in | 12 ++++++++++++
package/swupdate/swupdate.mk | 22 ++++++++++++++++------
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in
index 7d9fc90e10..4e3573569b 100644
--- a/package/swupdate/Config.in
+++ b/package/swupdate/Config.in
@@ -60,6 +60,18 @@ config BR2_PACKAGE_SWUPDATE_CONFIG
I you wish to use your own modified swupdate configuration
file specify the config file location with this option.
+config BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER
+ bool "swupdate embedded lua handler"
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+ help
+ Enable the embedded lua handler.
+
+config BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER_SOURCE
+ string "swupdate embedded lua handler source"
+ depends on BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER
+ help
+ Path to the embedded lua handler source.
+
config BR2_PACKAGE_SWUPDATE_USB
bool "swupdate usb"
depends on BR2_PACKAGE_SYSTEMD
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index ea4a5a62e5..5abdf7cb34 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -27,6 +27,12 @@ SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y
# we don't package EFI Boot Guard/libebgenv
SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=n
+SWUPDATE_MAKE_OPTS = \
+ SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
+
# swupdate bundles its own version of mongoose (version 6.16)
ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
@@ -113,6 +119,15 @@ define SWUPDATE_SET_LUA_VERSION
$(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))
endef
SWUPDATE_MAKE_ENV += HAVE_LUA=y
+ifeq ($(BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER),y)
+define SWUPDATE_SET_EMBEDDED_LUA
+ $(call KCONFIG_ENABLE_OPT,CONFIG_LUA)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_LUASCRIPTHANDLER)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_HANDLER_IN_LUA)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_EMBEDDED_LUA_HANDLER)
+endef
+SWUPDATE_MAKE_OPTS += CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=$(BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER_SOURCE)
+endif
else
SWUPDATE_MAKE_ENV += HAVE_LUA=n
endif
@@ -217,14 +232,9 @@ endif
SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
-SWUPDATE_MAKE_OPTS = \
- SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
- CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
-
define SWUPDATE_KCONFIG_FIXUP_CMDS
$(SWUPDATE_SET_LUA_VERSION)
+ $(SWUPDATE_SET_EMBEDDED_LUA)
$(SWUPDATE_SET_SYSTEMD)
$(SWUPDATE_SET_WEBSERVER)
endef
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH v3] package/swupdate: add embedded lua handler config option
2023-09-19 4:22 [Buildroot] [PATCH v2 1/1] package/swupdate: add embedded lua handler config option James Hilliard
@ 2026-11-21 16:50 ` Angelo Compagnucci
0 siblings, 0 replies; 2+ messages in thread
From: Angelo Compagnucci @ 2026-11-21 16:50 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, James Hilliard, Angelo Compagnucci
From: James Hilliard <james.hilliard1@gmail.com>
We are able to configure most swupdate options using a swupdate
config file, however the embedded lua source option may need to point
to a buildroot generated source path.
To simplify configuration of this swupdate option add a buildroot
config option which will pass a source file path to swupdate when
enabled in buildroot. We also need a config option to enable this
feature in swupdate which the source file path config option will
depend on.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Co-authored-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
Changes v2 -> v3:
- do not enable CONFIG_HANDLER_IN_LUA: swupdate removed it, and the
embedded handler now only needs CONFIG_LUA
- do not enable CONFIG_LUASCRIPTHANDLER: the Lua script handler is
another feature, not needed by the embedded handler
- strip the quotes of the source path with qstrip
- help text: say to use an absolute path, as swupdate looks for a
relative path in its own source tree
- rebase on master (swupdate 2026.05.1)
Changes v1 -> v2:
- pass path via make opts instead of kconfig
Supersedes v2: https://patchwork.buildroot.org/project/buildroot/patch/20230919042236.557974-1-james.hilliard1@gmail.com/
package/swupdate/Config.in | 15 +++++++++++++++
package/swupdate/swupdate.mk | 21 +++++++++++++++------
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in
index 112e53a127..0ad32950ed 100644
--- a/package/swupdate/Config.in
+++ b/package/swupdate/Config.in
@@ -60,6 +60,21 @@ config BR2_PACKAGE_SWUPDATE_CONFIG
I you wish to use your own modified swupdate configuration
file specify the config file location with this option.
+config BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER
+ bool "swupdate embedded lua handler"
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+ help
+ Enable the embedded lua handler.
+
+config BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER_SOURCE
+ string "swupdate embedded lua handler source"
+ depends on BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER
+ help
+ Path to the Lua handler source file to embed in the
+ swupdate binary. Use an absolute path, for example in a
+ br2-external:
+ $(BR2_EXTERNAL_<NAME>_PATH)/swupdate_handlers.lua
+
config BR2_PACKAGE_SWUPDATE_USB
bool "swupdate usb"
depends on BR2_PACKAGE_SYSTEMD
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index 2384dea33a..def4248fbd 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -28,6 +28,12 @@ SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y
# we don't package EFI Boot Guard/libebgenv
SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=n
+SWUPDATE_MAKE_OPTS = \
+ SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
+
# swupdate bundles its own version of mongoose (version 6.16)
ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
@@ -103,6 +109,14 @@ define SWUPDATE_SET_LUA_VERSION
$(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))
endef
SWUPDATE_MAKE_ENV += HAVE_LUA=y
+ifeq ($(BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER),y)
+define SWUPDATE_SET_EMBEDDED_LUA
+ $(call KCONFIG_ENABLE_OPT,CONFIG_LUA)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_EMBEDDED_LUA_HANDLER)
+endef
+SWUPDATE_MAKE_OPTS += \
+ CONFIG_EMBEDDED_LUA_HANDLER_SOURCE="$(call qstrip,$(BR2_PACKAGE_SWUPDATE_EMBEDDED_LUA_HANDLER_SOURCE))"
+endif
else
SWUPDATE_MAKE_ENV += HAVE_LUA=n
endif
@@ -205,14 +219,9 @@ endif
SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
-SWUPDATE_MAKE_OPTS = \
- SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
- CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
-
define SWUPDATE_KCONFIG_FIXUP_CMDS
$(SWUPDATE_SET_LUA_VERSION)
+ $(SWUPDATE_SET_EMBEDDED_LUA)
$(SWUPDATE_SET_SYSTEMD)
$(SWUPDATE_SET_WEBSERVER)
endef
--
2.53.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-21 16:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-19 4:22 [Buildroot] [PATCH v2 1/1] package/swupdate: add embedded lua handler config option James Hilliard
2026-11-21 16:50 ` [Buildroot] [PATCH v3] " Angelo Compagnucci
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox