From 67083c4ab4054d1c3f1df540c0927ee2b576a44f Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Wed, 9 Aug 2023 19:33:20 +0530 Subject: [PATCH] sulu: 3.0.0 --- sulu/sulu-base/Makefile | 4 ++-- sulu/sulu-builder/Makefile | 20 +++++++++------- sulu/sulu-builder/files/etc/sulu/sulu.sh | 30 +++++++++++++++--------- sulu/sulu-lcm/Makefile | 4 ++-- sulu/sulu-multi-ap/Makefile | 4 ++-- sulu/sulu-parental-control/Makefile | 4 ++-- sulu/sulu-theme-iopsys/Makefile | 4 ++-- 7 files changed, 40 insertions(+), 30 deletions(-) diff --git a/sulu/sulu-base/Makefile b/sulu/sulu-base/Makefile index c9f51346d..539bc106d 100644 --- a/sulu/sulu-base/Makefile +++ b/sulu/sulu-base/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-base -PKG_VERSION:=2.3.0 +PKG_VERSION:=3.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git -PKG_SOURCE_VERSION:=f7d77710c288668c7abf84ec82eeffc613723004 +PKG_SOURCE_VERSION:=d373b113d80a9610c74adfbc980ed59b7ae226a8 PKG_MIRROR_HASH:=skip SULU_MOD:=core diff --git a/sulu/sulu-builder/Makefile b/sulu/sulu-builder/Makefile index 9cb5d9a90..fa8d27709 100644 --- a/sulu/sulu-builder/Makefile +++ b/sulu/sulu-builder/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-builder -PKG_VERSION:=2.3.0 +PKG_VERSION:=3.0.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git -PKG_SOURCE_VERSION:=6d4933ac821600b051193951f24765569da2c9a4 +PKG_SOURCE_VERSION:=64260c8de3d4b1f74d46ad6f3b03057061fe73ef PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION) @@ -112,7 +112,7 @@ define Build/Clean endef define Package/sulu/install/Default - $(INSTALL_DIR) $(1)/sulu/config/widgets + $(INSTALL_DIR) $(1)/sulu/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_BIN) ./files/etc/config/sulu $(1)/etc/config/sulu @@ -143,21 +143,23 @@ ifneq ($(CONFIG_SULU_PWA_APP),y) $(CP) $(PKG_BUILD_DIR)/dist/nonPWA.html $(1)/sulu/index.html endif ifneq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy) - $(RM) $(1)/sulu/config/widgets/lcm-store.json + $(RM) $(1)/sulu/presets/lcm-store.json endif endef + define Package/sulu-builder/install $(Package/sulu/install/Default) + $(INSTALL_DIR) $(1)/sulu/presets + $(INSTALL_DIR) $(1)/sulu/settings $(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu ifneq ($(CONFIG_SULU_PWA_APP),y) $(CP) $(PKG_BUILD_DIR)/build/dist/nonPWA.html $(1)/sulu/index.html endif - $(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/ - $(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/ - $(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/wan.json $(1)/sulu/config/widgets/ -ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy) - $(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/ + $(CP) $(PKG_BUILD_DIR)/build/device/presets/*.json $(1)/sulu/presets/ + $(CP) $(PKG_BUILD_DIR)/build/device/settings/*.json $(1)/sulu/settings/ +ifneq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy) + $(RM) $(1)/sulu/presets/lcm-store.json endif endef diff --git a/sulu/sulu-builder/files/etc/sulu/sulu.sh b/sulu/sulu-builder/files/etc/sulu/sulu.sh index 766c81313..71162a0b4 100644 --- a/sulu/sulu-builder/files/etc/sulu/sulu.sh +++ b/sulu/sulu-builder/files/etc/sulu/sulu.sh @@ -53,6 +53,14 @@ function _get_sulu_root() echo "${root:-/sulu}" } +function _get_sulu_connection_config() +{ + local config + + config="$(_get_sulu_root)/presets/connection-config.json" + echo "${config}" +} + function _get_sulu_session_mode() { echo "$(uci -q get sulu.global.SessionMode)" @@ -104,15 +112,15 @@ function generate_sulu_conn_config() rbac="${1}" users="$(_get_sulu_users)" session="$(_get_sulu_session_mode)" - SCONFIG="$(_get_sulu_root)/config/connectionConfig.json" + SCONFIG="$(_get_sulu_connection_config)" json_init; if [ "${rbac}" -eq "1" ]; then - json_add_string 'currentConnection' 'rbac'; + json_add_string 'Current-connection' 'rbac'; else - json_add_string 'currentConnection' 'main'; + json_add_string 'Current-connection' 'main'; fi - json_add_object 'connections'; + json_add_object 'Connections'; json_add_object 'rbac'; json_add_string 'toId' "$(_get_endpoint_id)"; json_add_int 'port' "$(_get_sulu_tls_port)"; @@ -158,15 +166,15 @@ function set_sulu_connection_mode() { local rbac profile config SCONFIG - SCONFIG="$(_get_sulu_root)/config/connectionConfig.json" + SCONFIG="$(_get_sulu_connection_config)" rbac="${1}" - profile="$(jq '.currentConnection' ${SCONFIG})" + profile="$(jq '.Current-connection' ${SCONFIG})" if [ "$rbac" -eq "1" -a "${profile}" == "\"main\"" ]; then - config="$(jq '.currentConnection = "rbac"' ${SCONFIG})" + config="$(jq '.Current-connection = "rbac"' ${SCONFIG})" echo "${config}" > ${SCONFIG} elif [ "$rbac" -eq "0" -a "${profile}" == "\"rbac\"" ]; then - config="$(jq '.currentConnection = "main"' ${SCONFIG})" + config="$(jq '.Current-connection = "main"' ${SCONFIG})" echo "${config}" > ${SCONFIG} fi } @@ -175,12 +183,12 @@ function update_sulu_connection_port() { local port ws_port SCONF - SCONF="$(_get_sulu_root)/config/connectionConfig.json" + SCONF="$(_get_sulu_connection_config)" ws_port="$(_get_sulu_tls_port)" - port="$(jq '.connections.rbac.port' ${SCONF})" + port="$(jq '.Connections.rbac.port' ${SCONF})" if [ "${port}" -ne "${ws_port}" ]; then - jq ".connections.main.port = ${ws_port} | .connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json + jq ".Connections.main.port = ${ws_port} | .Connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json mv /tmp/sulu/ss_port.json ${SCONF} fi } diff --git a/sulu/sulu-lcm/Makefile b/sulu/sulu-lcm/Makefile index 356458cc2..6c84a9f7e 100644 --- a/sulu/sulu-lcm/Makefile +++ b/sulu/sulu-lcm/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-lcm -PKG_VERSION:=2.2.12 +PKG_VERSION:=3.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git -PKG_SOURCE_VERSION:=bc866b3679d07a80828aa40f7fcdaf18d48c7c61 +PKG_SOURCE_VERSION:=ac2e418026a0570bec16a77186a948e18e49d4c7 PKG_MIRROR_HASH:=skip SULU_PLUGIN_INSTALL:=1 diff --git a/sulu/sulu-multi-ap/Makefile b/sulu/sulu-multi-ap/Makefile index fec2c727b..39af296c5 100644 --- a/sulu/sulu-multi-ap/Makefile +++ b/sulu/sulu-multi-ap/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-multi-ap -PKG_VERSION:=2.2.18 +PKG_VERSION:=3.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git -PKG_SOURCE_VERSION:=ae4cb0a27b7d084aaad69e81cb4d96d88ecdffee +PKG_SOURCE_VERSION:=3f2c1e0fc3b44911297a23aec50d964dcd993e0a PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk diff --git a/sulu/sulu-parental-control/Makefile b/sulu/sulu-parental-control/Makefile index 747c62413..3df7d43ca 100644 --- a/sulu/sulu-parental-control/Makefile +++ b/sulu/sulu-parental-control/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-parental-control -PKG_VERSION:=2.2.12 +PKG_VERSION:=3.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git -PKG_SOURCE_VERSION:=e005dd22fd98342df9589e05dd89e322265a2dcc +PKG_SOURCE_VERSION:=b50857e88d14de9752bd081159a6c71e8ea03539 PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk diff --git a/sulu/sulu-theme-iopsys/Makefile b/sulu/sulu-theme-iopsys/Makefile index 4eef8ef9e..888541d2e 100644 --- a/sulu/sulu-theme-iopsys/Makefile +++ b/sulu/sulu-theme-iopsys/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-theme-iopsys -PKG_VERSION:=2.0.0 +PKG_VERSION:=3.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git -PKG_SOURCE_VERSION:=e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d +PKG_SOURCE_VERSION:=a69b75e44d111d2a943563f96413a7363a0b4bca PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk