From 38da101b11cf086ae3ed84b397b5baf46e0967ff Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 28 Aug 2021 20:46:30 -0600 Subject: [PATCH] package/swupdate: add webserver config option Since the website depends on the webserver being enabled we should add a config option for it and make the website depend on that. We should also ensure that the mongoose(webserver) config is present. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 25b0645aa4f6a6457942b50161e7e0c05b4222d3) Signed-off-by: Peter Korsgaard --- package/swupdate/10-mongoose-args | 1 + package/swupdate/Config.in | 7 +++++++ package/swupdate/swupdate.mk | 14 ++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/swupdate/10-mongoose-args diff --git a/package/swupdate/10-mongoose-args b/package/swupdate/10-mongoose-args new file mode 100644 index 0000000000..d0b0f8be94 --- /dev/null +++ b/package/swupdate/10-mongoose-args @@ -0,0 +1 @@ +SWUPDATE_WEBSERVER_ARGS="-r /var/www/swupdate ${SWUPDATE_MONGOOSE_EXTRA_ARGS:--p 8080}" diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index e87f695861..188d12433a 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -59,9 +59,16 @@ 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_WEBSERVER + bool "swupdate webserver" + default y + help + Enable update from remote using a web server on the target. + config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE bool "install default website" default y + depends on BR2_PACKAGE_SWUPDATE_WEBSERVER help Install the provided website to /var/www/swupdate. diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 3327596d19..6c9e110bc4 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -153,6 +153,16 @@ ifeq ($(BR2_PACKAGE_LIBRSYNC),y) SWUPDATE_DEPENDENCIES += librsync endif +ifeq ($(BR2_PACKAGE_SWUPDATE_WEBSERVER),y) +define SWUPDATE_SET_WEBSERVER + $(call KCONFIG_ENABLE_OPT,CONFIG_WEBSERVER) +endef +else +define SWUPDATE_SET_WEBSERVER + $(call KCONFIG_DISABLE_OPT,CONFIG_WEBSERVER) +endef +endif + SWUPDATE_BUILD_CONFIG = $(@D)/.config SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) @@ -173,6 +183,7 @@ define SWUPDATE_KCONFIG_FIXUP_CMDS $(SWUPDATE_PREFER_STATIC) $(SWUPDATE_SET_LUA_VERSION) $(SWUPDATE_SET_SYSTEMD) + $(SWUPDATE_SET_WEBSERVER) endef define SWUPDATE_BUILD_CMDS @@ -202,6 +213,9 @@ define SWUPDATE_INSTALL_COMMON $(TARGET_DIR)/usr/lib/swupdate/conf.d $(INSTALL) -D -m 755 package/swupdate/swupdate.sh \ $(TARGET_DIR)/usr/lib/swupdate/swupdate.sh + $(if $(BR2_PACKAGE_SWUPDATE_WEBSERVER), \ + $(INSTALL) -D -m 644 package/swupdate/10-mongoose-args \ + $(TARGET_DIR)/usr/lib/swupdate/conf.d/10-mongoose-args) endef define SWUPDATE_INSTALL_INIT_SYSTEMD $(SWUPDATE_INSTALL_COMMON)