d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2021.02.5 (#1566)

Browse Source 
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
2021-10-04 22:00:47 +02:00
committed by GitHub
parent bd6562edf6
commit c5c5b6bcbe
165 changed files with 3543 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot/package/swupdate/10-mongoose-args Normal file
View File

@@ -0,0 +1 @@
SWUPDATE_WEBSERVER_ARGS="-r /var/www/swupdate ${SWUPDATE_MONGOOSE_EXTRA_ARGS:--p 8080}"

7
buildroot/package/swupdate/Config.in
View File

@@ -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.

35
buildroot/package/swupdate/swupdate.mk
View File

@@ -13,7 +13,7 @@ SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.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)
@@ -112,6 +112,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)
@@ -146,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))
@@ -165,14 +182,17 @@ SWUPDATE_MAKE_OPTS = \
define SWUPDATE_KCONFIG_FIXUP_CMDS
$(SWUPDATE_PREFER_STATIC)
$(SWUPDATE_SET_LUA_VERSION)
$(SWUPDATE_SET_SYSTEMD)
$(SWUPDATE_SET_WEBSERVER)
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)
@@ -186,23 +206,28 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT
endif
endif
ifeq ($(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE),y)
# 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
$(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)
$(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)
$(INSTALL) -D -m 755 package/swupdate/S80swupdate \
$(TARGET_DIR)/etc/init.d/S80swupdate
endef
endif
$(eval $(kconfig-package))

2
buildroot/package/swupdate/tmpfiles-swupdate.conf Normal file
View File

@@ -0,0 +1,2 @@
X /tmp/datadst
X /tmp/scripts