diff --git a/sulu-builder/Makefile b/sulu-builder/Makefile index d62e1d72b..ad392042d 100644 --- a/sulu-builder/Makefile +++ b/sulu-builder/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-builder -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.2.1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git -PKG_SOURCE_VERSION:=17acb0487cf7fe8d43decfc7840abcd61646edf3 +PKG_SOURCE_VERSION:=fef8ca44198ab2ef2d2e7141dada4036e81c80b1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip @@ -147,7 +147,10 @@ define Package/${PKG_NAME}/install $(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/ $(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu $(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/ - $(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/widgets/ + $(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.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/ +endif $(CP) ./files/* $(1)/ endef diff --git a/sulu/Makefile b/sulu/Makefile index 57d842f08..3fcd72f92 100644 --- a/sulu/Makefile +++ b/sulu/Makefile @@ -1,15 +1,15 @@ # -# Copyright (C) 2021 IOPSYS +# Copyright (C) 2021-2022 IOPSYS # include $(TOPDIR)/rules.mk PKG_NAME:=sulu -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.2.1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git -PKG_SOURCE_VERSION:=17acb0487cf7fe8d43decfc7840abcd61646edf3 +PKG_SOURCE_VERSION:=fef8ca44198ab2ef2d2e7141dada4036e81c80b1 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz @@ -37,10 +37,15 @@ endef define Package/sulu/install $(INSTALL_DIR) $(1)/sulu $(INSTALL_DIR) $(1)/sulu/config + $(INSTALL_DIR) $(1)/sulu/config/widgets $(INSTALL_DIR) $(1)/etc/nginx/ $(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/ $(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu - $(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config + $(CP) $(PKG_BUILD_DIR)/config/*.json $(1)/sulu/config + $(CP) $(PKG_BUILD_DIR)/config/widgets/diagnostics.json $(1)/sulu/config/widgets/ +ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy) + $(CP) $(PKG_BUILD_DIR)/config/widgets/lcm-store.json $(1)/sulu/config/widgets/ +endif $(CP) ./files/* $(1)/ endef