sulu: Added sulu plugins as packages

sulu-base/Makefile

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sulu-base
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
+PKG_SOURCE_VERSION:=ea9b80a6f7a5fc2230d97706fd1ddbbac66fc6a7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+SULU_MOD:=core
+include ../sulu-builder/sulu.mk
+
+# call BuildPackage - OpenWrt buildroot signature

sulu-builder/Config.in

@@ -1,126 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_sulu-builder
-
-menu "SULU_CORE"
-	depends on PACKAGE_sulu-builder
-	config SULU_CORE_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_CORE_URL
-		string "SULU url"
-		default "https://dev.iopsys.eu/websdk/sulu.git"
-
-	config SULU_CORE_VERSION
-		string "SULU repo version"
-		default "ea9b80a6f7a5fc2230d97706fd1ddbbac66fc6a7"
-endmenu
-
-menu "SULU_PLUGIN_LCM"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_LCM_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_PLUGIN_LCM_NAME
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "Plugin_name"
-		default "sulu-lcm"
-
-	config SULU_PLUGIN_LCM_URL
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-lcm.git"
-
-	config SULU_PLUGIN_LCM_VERSION
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "Version"
-		default "068e71a3ec28dfa984f20fdc9796784f36d497dd"
-endmenu
-
-menu "SULU_PLUGIN_MULTIAP"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_MULTIAP_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_PLUGIN_MULTIAP_NAME
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "Plugin_name"
-		default "sulu-multi-ap"
-
-	config SULU_PLUGIN_MULTIAP_URL
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-multi-ap.git"
-
-	config SULU_PLUGIN_MULTIAP_VERSION
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "Version"
-		default "7f4744e328478bdf8e6d599a1b99751c3c2cccb4"
-endmenu
-
-menu "SULU_THEME_IOPSYS"
-	depends on PACKAGE_sulu-builder
-	config SULU_THEME_IOPSYS_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_THEME_IOPSYS_NAME
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "Plugin_name"
-		default "sulu-theme-iopsys"
-
-	config SULU_THEME_IOPSYS_URL
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git"
-
-	config SULU_THEME_IOPSYS_VERSION
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "Version"
-		default "e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d"
-endmenu
-
-menu "SULU_PLUGIN_CUSTOM"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_CUSTOM_ENABLE
-	bool "Enable this plugin"
-	default n
-
-	config SULU_PLUGIN_CUSTOM_NAME
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "Plugin_name"
-		default "custom_app"
-
-	config SULU_PLUGIN_CUSTOM_URL
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "URL"
-		default ""
-
-	config SULU_PLUGIN_CUSTOM_VERSION
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "Version"
-endmenu
-
-menu "SULU_THEME_CUSTOM"
-	depends on PACKAGE_sulu-builder
-	config SULU_THEME_CUSTOM_ENABLE
-	bool "Enable this plugin"
-	default n
-
-	config SULU_THEME_CUSTOM_NAME
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "Plugin_name"
-		default "plugin_theme_custom"
-
-	config SULU_THEME_CUSTOM_URL
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "URL"
-		default ""
-
-	config SULU_THEME_CUSTOM_VERSION
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "Version"
-endmenu
-endmenu

sulu-builder/Makefile

@@ -5,24 +5,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.3.0
+PKG_VERSION:=2.0.0
 
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=524418f7a2e6e2b1d807b2a87f9f80ac3cb1d1b6
+PKG_SOURCE_VERSION:=cd1bdbbb5e658493504caf5be36182f3dc5bfbca
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+endif
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+SULU_PLUGINS:=sulu-lcm sulu-multi-ap sulu-theme-iopsys
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/${PKG_NAME}
 	SECTION:=utils
 	CATEGORY:=Utilities
+	SUBMENU:=SULU
 	TITLE:=Build sulu from source
-	DEPENDS:=+nginx +mosquitto-auth-shadow
+	EXTRA_DEPENDS:=nginx mosquitto-auth-shadow
+	DEPENDS:=+sulu-base $(foreach plugin,$(SULU_PLUGINS), +PACKAGE_$(plugin):$(plugin))
 	CONFLICTS:=sulu
 endef
 
@@ -30,113 +37,14 @@ define Package/${PKG_NAME}/description
 	SULU-CE ReactJS based Web UI builder.
 endef
 
-define Package/${PKG_NAME}/config
-	source "$(SOURCE)/Config.in"
-endef
-
-# Sulu core and other dependent needs to be updated in Config.in
-SULU_DL_FILE:=sulu_core-${CONFIG_SULU_CORE_VERSION}.tar.gz
-define Download/sulu_core
-  FILE:=$(SULU_DL_FILE)
-  URL:=$(CONFIG_SULU_CORE_URL)
-  PROTO:=git
-  SUBDIR:=core
-  VERSION:=${CONFIG_SULU_CORE_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_CORE_ENABLE),y)
-$(eval $(call Download,sulu_core))
-endif
-
-SULU_PLUGIN_LCM_DL:=${CONFIG_SULU_PLUGIN_LCM_NAME}_plugin-${CONFIG_SULU_PLUGIN_LCM_VERSION}.tar.gz
-define Download/sulu_plugin_lcm
-  FILE:=${SULU_PLUGIN_LCM_DL}
-  URL:=${CONFIG_SULU_PLUGIN_LCM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_LCM_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_LCM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
-$(eval $(call Download,sulu_plugin_lcm))
-endif
-
-SULU_PLUGIN_MULTIAP_DL:=${CONFIG_SULU_PLUGIN_MULTIAP_NAME}_plugin-${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}.tar.gz
-define Download/sulu_plugin_multiap
-  FILE:=${SULU_PLUGIN_MULTIAP_DL}
-  URL:=${CONFIG_SULU_PLUGIN_MULTIAP_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_MULTIAP_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
-$(eval $(call Download,sulu_plugin_multiap))
-endif
-
-SULU_THEME_IOPSYS_DL:=${CONFIG_SULU_THEME_IOPSYS_NAME}_plugin-${CONFIG_SULU_THEME_IOPSYS_VERSION}.tar.gz
-define Download/sulu_theme_iopsys
-  FILE:=${SULU_THEME_IOPSYS_DL}
-  URL:=${CONFIG_SULU_THEME_IOPSYS_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_THEME_IOPSYS_NAME}
-  VERSION:=${CONFIG_SULU_THEME_IOPSYS_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
-$(eval $(call Download,sulu_theme_iopsys))
-endif
-
-SULU_PLUGIN_CUSTOM_DL:=${CONFIG_SULU_PLUGIN_CUSTOM_NAME}_plugin-${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}.tar.gz
-define Download/sulu_plugin_custom
-  FILE:=${SULU_PLUGIN_CUSTOM_DL}
-  URL:=${CONFIG_SULU_PLUGIN_CUSTOM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_CUSTOM_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
-$(eval $(call Download,sulu_plugin_custom))
-endif
-
-SULU_THEME_CUSTOM_DL:=${CONFIG_SULU_THEME_CUSTOM_NAME}_plugin-${CONFIG_SULU_THEME_CUSTOM_VERSION}.tar.gz
-define Download/sulu_theme_custom
-  FILE:=${SULU_THEME_CUSTOM_DL}
-  URL:=${CONFIG_SULU_THEME_CUSTOM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_THEME_CUSTOM_NAME}
-  VERSION:=${CONFIG_SULU_THEME_CUSTOM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
-$(eval $(call Download,sulu_theme_custom))
-endif
-
+ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(Build/Prepare/Default)
-	tar xzf $(DL_DIR)/${SULU_DL_FILE} -C $(PKG_BUILD_DIR)
-ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_LCM_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_MULTIAP_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_THEME_IOPSYS_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_CUSTOM_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_THEME_CUSTOM_DL} -C $(PKG_BUILD_DIR)
+	$(CP) -rf ~/git/sulu-builder/* $(PKG_BUILD_DIR)/
+endef
 endif
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) CORE_DIR="../sulu-stagging/core/sulu-base" PLUGINS_PATH="../sulu-stagging/plugin"
 endef
 
 define Package/${PKG_NAME}/install

sulu-builder/sulu.mk

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+SULU_NAME?=$(notdir ${CURDIR})
+SULU_URL?=https://dev.iopsys.eu/websdk
+SULU_MAINTAINER?=IOPSYS SuLu team
+
+SULU_MOD?=plugin
+
+PKG_NAME?=$(SULU_NAME)
+PKG_RELEASE?=1
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(SULU_MOD)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=SULU
+  TITLE:=$(if $(SULU_TITLE),$(SULU_TITLE),Sulu plugin or module $(SULU_NAME))
+  EXTRA_DEPENDS:=sulu-builder
+  URL:=$(SULU_URL)/$(SULU_NAME)
+  MAINTAINER:=$(SULU_MAINTAINER)
+endef
+
+ifneq ($(SULU_DESCRIPTION),)
+ define Package/$(PKG_NAME)/description
+   $(strip $(SULU_DESCRIPTION))
+ endef
+endif
+
+define Build/Compile
+	mkdir -p $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)
+	-unlink $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(1)
+	$(LN) $(PKG_BUILD_DIR) $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(1)
+endef
+
+define Build/Clean
+	-unlink $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(SULU_NAME)
+	$(call Build/Clean/Default)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/sulu/config/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

sulu-lcm/Makefile

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+PKG_NAME:=sulu-lcm
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
+PKG_SOURCE_VERSION:=068e71a3ec28dfa984f20fdc9796784f36d497dd
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+include ../sulu-builder/sulu.mk
+
+# call BuildPackage - OpenWrt buildroot signature

sulu-multi-ap/Makefile

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+PKG_NAME:=sulu-multi-ap
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
+PKG_SOURCE_VERSION:=7f4744e328478bdf8e6d599a1b99751c3c2cccb4
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+include ../sulu-builder/sulu.mk
+
+# call BuildPackage - OpenWrt buildroot signature

sulu-theme-iopsys/Makefile

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+PKG_NAME:=sulu-theme-iopsys
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git
+PKG_SOURCE_VERSION:=e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+include ../sulu-builder/sulu.mk
+
+# call BuildPackage - OpenWrt buildroot signature

sulu/Makefile

@@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
+	SUBMENU:=SULU
 	TITLE:=SULU-CE ReactJS based Web UI Package
 	DEPENDS:=+nginx +mosquitto-auth-shadow
 endef