diff --git a/sulu/Readme.md b/sulu/Readme.md index 15980743d..f8b94f088 100644 --- a/sulu/Readme.md +++ b/sulu/Readme.md @@ -69,8 +69,8 @@ PKG_MIRROR_HASH:=skip SULU_PLUGIN_INSTALL:=1 define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/sulu/config/widgets - $(CP) $(PKG_BUILD_DIR)/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/ + $(INSTALL_DIR) $(1)/ + $(CP) $(PKG_BUILD_DIR)//lcm-store.json $(1)// endef include ../sulu-builder/sulu.mk diff --git a/sulu/sulu-base/Makefile b/sulu/sulu-base/Makefile index a5eb62897..01bd0166f 100644 --- a/sulu/sulu-base/Makefile +++ b/sulu/sulu-base/Makefile @@ -5,21 +5,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-base -PKG_VERSION:=3.1.8 +PKG_VERSION:=3.1.10 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git -PKG_SOURCE_VERSION:=a6cee90e19f97efe2299f3d6d54b8762892ae513 +PKG_SOURCE_VERSION:=e9d9c19a178ab2565317500d14f7084fbe351bfb PKG_MIRROR_HASH:=skip SULU_MOD:=core include ../sulu-builder/sulu.mk -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/sulu/config/widgets - $(CP) $(PKG_BUILD_DIR)/src/config/*.json $(1)/sulu/config/ - $(CP) $(PKG_BUILD_DIR)/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/ - $(CP) $(PKG_BUILD_DIR)/src/config/widgets/wan.json $(1)/sulu/config/widgets/ -endef - # call BuildPackage - OpenWrt buildroot signature diff --git a/sulu/sulu-builder/Makefile b/sulu/sulu-builder/Makefile index dff4787b4..ab142be55 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:=3.1.9 +PKG_VERSION:=3.1.10 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git -PKG_SOURCE_VERSION:=132e27d17e8754a6eceaca55ead2809eafb2b08e +PKG_SOURCE_VERSION:=8fc6672e8b679a6ed56ffb81416ae3f562a82ae9 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) @@ -149,14 +149,10 @@ 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/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 diff --git a/sulu/sulu-lcm/Makefile b/sulu/sulu-lcm/Makefile index 75a6c35f0..6eb4aee9f 100644 --- a/sulu/sulu-lcm/Makefile +++ b/sulu/sulu-lcm/Makefile @@ -4,22 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-lcm -PKG_VERSION:=3.1.1 +PKG_VERSION:=3.1.10 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git -PKG_SOURCE_VERSION:=d4c0522c9a7cc59e621d5f967fa6b001a025c7ae +PKG_SOURCE_VERSION:=1dff4a7064a85873a0665383137b8eca9d9040a6 PKG_MIRROR_HASH:=skip -SULU_PLUGIN_INSTALL:=1 - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/sulu/config/widgets -ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy) - $(CP) $(PKG_BUILD_DIR)/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/ -endif -endef - include ../sulu-builder/sulu.mk diff --git a/sulu/sulu-multi-ap/Makefile b/sulu/sulu-multi-ap/Makefile index 46e4ce394..8e3e5d833 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:=3.1.6 +PKG_VERSION:=3.1.10 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git -PKG_SOURCE_VERSION:=07da9a4d69452a6b092cd0c529186a5cb3b3c538 +PKG_SOURCE_VERSION:=0d065004c5f0f68e67b53478aee81564a8e7d85b PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk