package/swupdate: let buildroot handle stripping
PATCH v2 1/8 package/swupdate: let buildroot handle stripping
In buildroot, stripping for the target is configured and implemented with the global BR2_STRIP_strip option that drive the stripping in the target-finalize step.
So, we explicitly disable stripping at build time for swupdate.
--- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/swupdate/swupdate.mk +1 -1
@@ -22,7 +22,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure # TARGET_CC is used for both. -SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" +SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y # swupdate bundles its own version of mongoose (version 6.16)
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 2/8 package/swupdate: don't require website for services
The swupdate services do not depend on BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE, so install them unconditionally.
--- package/swupdate/swupdate.mk | 2 -- 1 file changed, 2 deletions(-)
package/swupdate/swupdate.mk +0 -2
@@ -213,7 +213,6 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT endif endif -ifeq ($(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE),y) define SWUPDATE_INSTALL_COMMON mkdir -p $(TARGET_DIR)/etc/swupdate/conf.d \ $(TARGET_DIR)/usr/lib/swupdate/conf.d
@@ -230,6 +229,5 @@ define SWUPDATE_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/swupdate/S80swupdate \ $(TARGET_DIR)/etc/init.d/S80swupdate endef -endif $(eval $(kconfig-package))
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 2/8] package/swupdate: don't require website for services
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
The swupdate services do not depend on
BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE, so install them unconditionally.Signed-off-by James Hilliard <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/8 package/swupdate: use package make install for target install
In reply to James HilliardThis ensures all tools/libraries will be properly installed.
Update SWUPDATE_BUILD_CMDS param ordering for consistency.
--- package/swupdate/swupdate.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/swupdate/swupdate.mk +3 -2
@@ -195,11 +195,12 @@ define SWUPDATE_KCONFIG_FIXUP_CMDS endef define SWUPDATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) $(SWUPDATE_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef define SWUPDATE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install $(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \ mkdir -p $(TARGET_DIR)/var/www/swupdate; \ cp -dpfr $(@D)/examples/www/v2/* $(TARGET_DIR)/var/www/swupdate)
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 3/8] package/swupdate: use package make install for target install
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
This ensures all
tools/librarieswill be properly installed. UpdateSWUPDATE_BUILD_CMDSparam ordering for consistency.Signed-off-by James Hilliard <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/8 package/swupdate: enable/disable systemd support automatically
In reply to James HilliardThis needs to be set properly so that services work correctly.
Enable disable automatically based on BR2_PACKAGE_SYSTEMD state.
--- package/swupdate/swupdate.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
package/swupdate/swupdate.mk +8 -0
@@ -139,6 +139,13 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) SWUPDATE_DEPENDENCIES += systemd +define SWUPDATE_SET_SYSTEMD + $(call KCONFIG_ENABLE_OPT,CONFIG_SYSTEMD) +endef +else +define SWUPDATE_SET_SYSTEMD + $(call KCONFIG_DISABLE_OPT,CONFIG_SYSTEMD) +endef endif ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y)
@@ -192,6 +199,7 @@ SWUPDATE_MAKE_OPTS = \ define SWUPDATE_KCONFIG_FIXUP_CMDS $(SWUPDATE_SET_LUA_VERSION) + $(SWUPDATE_SET_SYSTEMD) endef define SWUPDATE_BUILD_CMDS
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/8] package/swupdate: enable/disable systemd support automatically
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
This needs to be set properly so that services work correctly. Enable disable automatically based on
BR2_PACKAGE_SYSTEMDstate.Signed-off-by James Hilliard <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/8 package/swupdate: add comment on origin of services/configs
In reply to James Hilliard--- package/swupdate/swupdate.mk | 2 ++ 1 file changed, 2 insertions(+)
package/swupdate/swupdate.mk +2 -0
@@ -222,6 +222,8 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT endif endif +# Services and configs derived from meta-swupdate(MIT license) +# https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate define SWUPDATE_INSTALL_COMMON mkdir -p $(TARGET_DIR)/etc/swupdate/conf.d \ $(TARGET_DIR)/usr/lib/swupdate/conf.d
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 5/8] package/swupdate: add comment on origin of services/configs
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
Signed-off-by James Hilliard <[email protected]>--- package/swupdate/swupdate.mk | 2 ++ 1 file changed, 2 insertions(+)package/swupdate/swupdate.mk +0
-0
package/swupdate/swupdate.mk $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT · line 225
Quoted 4 lines
package/swupdate/swupdate.mk +1
-0@@ -222,6 +222,8 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT endif endif +# Services and configs derived from meta-swupdate(MIT license)
It would have been nice with a space before '(MIT', but OK.
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 6/8 package/swupdate: add webserver config option
In reply to James HilliardSince 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.
--- 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
package/swupdate/10-mongoose-args new file +1 -0
@@ -0,0 +1 @@ +SWUPDATE_WEBSERVER_ARGS="-r /var/www/swupdate ${SWUPDATE_MONGOOSE_EXTRA_ARGS:--p 8080}"
package/swupdate/Config.in +7 -0
@@ -60,9 +60,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.
package/swupdate/swupdate.mk +14 -0
@@ -187,6 +187,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))
@@ -200,6 +210,7 @@ SWUPDATE_MAKE_OPTS = \ define SWUPDATE_KCONFIG_FIXUP_CMDS $(SWUPDATE_SET_LUA_VERSION) $(SWUPDATE_SET_SYSTEMD) + $(SWUPDATE_SET_WEBSERVER) endef define SWUPDATE_BUILD_CMDS
@@ -229,6 +240,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)
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 6/8] package/swupdate: add webserver config option
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
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 <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 7/8 package/swupdate: prevent systemd from removing swupdate tmp folders
In reply to James HilliardEnsure these folders are excluded from being cleaned up by systemd.
Fixes:
[ERROR] : SWUPDATE failed [0] ERROR : I cannot open /tmp/scripts/format.lua 2 [ERROR] : SWUPDATE failed [0] ERROR : extracting script to /tmp/scripts/ failed [ERROR] : SWUPDATE failed [1] Installation failed !
--- package/swupdate/swupdate.mk | 2 ++ package/swupdate/tmpfiles-swupdate.conf | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 package/swupdate/tmpfiles-swupdate.conf
package/swupdate/swupdate.mk +2 -0
@@ -248,6 +248,8 @@ define SWUPDATE_INSTALL_INIT_SYSTEMD $(SWUPDATE_INSTALL_COMMON) $(INSTALL) -D -m 644 package/swupdate/swupdate.service \ $(TARGET_DIR)/usr/lib/systemd/system/swupdate.service + $(INSTALL) -D -m 644 package/swupdate/tmpfiles-swupdate.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/tmpfiles-swupdate.conf endef define SWUPDATE_INSTALL_INIT_SYSV $(SWUPDATE_INSTALL_COMMON)
package/swupdate/tmpfiles-swupdate.conf new file +2 -0
@@ -0,0 +1,2 @@ +X /tmp/datadst +X /tmp/scripts
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 7/8] package/swupdate: prevent systemd from removing swupdate tmp folders
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
Ensure these folders are excluded from being cleaned up by systemd. Fixes:
[ERROR] : SWUPDATE failed [0] ERROR : I cannot open/tmp/scripts/format.lua2 [ERROR] : SWUPDATE failed [0] ERROR : extracting script to/tmp/scripts/failed [ERROR] : SWUPDATE failed [1] Installation failed !Signed-off-by James Hilliard <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 8/8 package/swupdate: add progress/usb services
In reply to James HilliardInstall progress/usb services for swupdate based on meta-swupdate configs.
--- package/swupdate/90-start-progress | 1 + package/swupdate/swupdate-progress.service | 9 +++++++++ package/swupdate/[email protected] | 8 ++++++++ package/swupdate/swupdate.mk | 8 ++++++++ package/swupdate/swupdate.socket | 11 +++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/swupdate/90-start-progress create mode 100644 package/swupdate/swupdate-progress.service create mode 100644 package/swupdate/[email protected] create mode 100644 package/swupdate/swupdate.socket
package/swupdate/90-start-progress new file +1 -0
@@ -0,0 +1 @@ +exec /usr/bin/swupdate-progress -w -r &
package/swupdate/swupdate-progress.service new file +9 -0
@@ -0,0 +1,9 @@ +[Unit] +Description=swupdate progress service +After=swupdate.service + +[Service] +ExecStart=/usr/bin/swupdate-progress -r -w + +[Install] +WantedBy=swupdate.service
package/swupdate/[email protected] new file +8 -0
@@ -0,0 +1,8 @@ +[Unit] +Description=usb media swupdate service +Requires=swupdate-progress.service + +[Service] +ExecStartPre=/bin/mount /dev/%I /mnt +ExecStart=/bin/sh -c "swupdate-client -v /mnt/*.swu" +ExecStopPost=/bin/umount /mnt
package/swupdate/swupdate.mk +8 -0
@@ -248,6 +248,12 @@ define SWUPDATE_INSTALL_INIT_SYSTEMD $(SWUPDATE_INSTALL_COMMON) $(INSTALL) -D -m 644 package/swupdate/swupdate.service \ $(TARGET_DIR)/usr/lib/systemd/system/swupdate.service + $(INSTALL) -D -m 644 package/swupdate/swupdate.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/swupdate.socket + $(INSTALL) -D -m 644 package/swupdate/[email protected] \ + $(TARGET_DIR)/usr/lib/systemd/system/[email protected] + $(INSTALL) -D -m 644 package/swupdate/swupdate-progress.service \ + $(TARGET_DIR)/usr/lib/systemd/system/swupdate-progress.service $(INSTALL) -D -m 644 package/swupdate/tmpfiles-swupdate.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/tmpfiles-swupdate.conf endef
@@ -255,6 +261,8 @@ define SWUPDATE_INSTALL_INIT_SYSV $(SWUPDATE_INSTALL_COMMON) $(INSTALL) -D -m 755 package/swupdate/S80swupdate \ $(TARGET_DIR)/etc/init.d/S80swupdate + $(INSTALL) -D -m 644 package/swupdate/90-start-progress \ + $(TARGET_DIR)/usr/lib/swupdate/conf.d/90-start-progress endef $(eval $(kconfig-package))
package/swupdate/swupdate.socket new file +11 -0
@@ -0,0 +1,11 @@ +[Unit] +Description=SWUpdate socket listener +Documentation=https://github.com/sbabic/swupdate +Documentation=https://sbabic.github.io/swupdate + +[Socket] +ListenStream=/tmp/sockinstctrl +ListenStream=/tmp/swupdateprog + +[Install] +WantedBy=sockets.target
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Hi James,
Quoted 7 lines · James Hilliard
In buildroot, stripping for the target is configured and implemented with the global
BR2_STRIP_stripoption that drive the stripping in the target-finalize step.So, we explicitly disable stripping at build time for swupdate.
Signed-off-by James Hilliard <[email protected]>
Series applied to master, thanks.
I first had some misgivings about some of the patches, but after investigating
more and trying things out in qemu it turns out to be all perfect!
Regards,
Arnout
Quoted 10 lines
--- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/swupdate/swupdate.mk +0
-0
package/swupdate/swupdate.mk SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ · line 28
Quoted 8 lines
package/swupdate/swupdate.mk +1
-1@@ -22,7 +22,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure # TARGET_CC is used for both. -SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" +SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y # swupdate bundles its own version of mongoose (version 6.16)
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
In buildroot, stripping for the target is configured and implemented with the global
BR2_STRIP_stripoption that drive the stripping in the target-finalize step.So, we explicitly disable stripping at build time for swupdate.
Signed-off-by James Hilliard <[email protected]>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot