From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@buildroot.org
Cc: James Hilliard <james.hilliard1@gmail.com>
Subject: [Buildroot] [PATCH v2 1/1] package/swupdate: add embedded lua handler config option
Date: Mon, 18 Sep 2023 22:22:36 -0600 [thread overview]
Message-ID: <20230919042236.557974-1-james.hilliard1@gmail.com> (raw)
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
next reply other threads:[~2023-09-19 4:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 4:22 James Hilliard [this message]
2026-11-21 16:50 ` [Buildroot] [PATCH v3] package/swupdate: add embedded lua handler config option Angelo Compagnucci
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230919042236.557974-1-james.hilliard1@gmail.com \
--to=james.hilliard1@gmail.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox