Skip to content
Snippets Groups Projects
Verified Commit 53cab3bd authored by Karel Koci's avatar Karel Koci :metal:
Browse files

web: move Foris packages to appropriate menu section 

This is change of menuconfig location in most cases.

This also moves turris-webapps packages to subdirectory to better
reflect new menuconfig alligment.
parent 45a29dfd
Branches
Tags
2 merge requests!697Turris OS 5.2 merge,!561Feature/move turris webapps
Hide whitespace changes
Inline Side-by-side
Showing
with 94 additions and 34 deletions
web/foris-controller/follectd/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,13 +9,16 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=follectd
PKG_VERSION:=5
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
include $(INCLUDE_DIR)/package.mk
define Package/follectd
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=follectd
DEPENDS:=\
+collectd \
......
web/foris-controller/foris-client/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-client
PKG_VERSION:=1.0.3
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-client.git
......@@ -23,6 +23,9 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
define Package/foris-client
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=foris-client
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-client
DEPENDS:= \
......
web/foris-controller/foris-controller-collectd-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-collectd-module
PKG_VERSION:=0.2
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-collectd-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-collectd-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller collectd module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-data_collect-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-data_collect-module
PKG_VERSION:=1.1
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-data_collect-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-data_collect-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller data collect module
DEPENDS:=+foris-controller
VARIANT:=python3
......
web/foris-controller/foris-controller-diagnostics-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-diagnostics-module
PKG_VERSION:=1.0.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-diagnostics-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-diagnostics-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Diagnostics module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-haas-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-haas-module
PKG_VERSION:=0.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-haas-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-haas-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller HaaS module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller-netboot-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-netboot-module
PKG_VERSION:=0.4.1
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-netboot-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-netboot-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller netboot module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller-netmetr-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-netmetr-module
PKG_VERSION:=0.4.2
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-netmetr-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-netmetr-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Netmetr module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller-nextcloud-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-nextcloud-module
PKG_VERSION:=0.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-nextcloud-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-nextcloud-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Nextcloud module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-openvpn-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-openvpn-module
PKG_VERSION:=0.6.2
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-openvpn-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-openvpn-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller OpenVPN module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller-openvpn_client-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-openvpn_client-module
PKG_VERSION:=0.3
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-openvpn_client-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-openvpn_client-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller OpenVPN client module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-pakon-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-pakon-module
PKG_VERSION:=0.2.1
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-pakon-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-pakon-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=foris-controller-pakon-module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-schnapps-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-schnapps-module
PKG_VERSION:=0.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-schnapps-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-schnapps-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris-controller schnapps module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-sentinel-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-sentinel-module
PKG_VERSION:=0.1.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-sentinel-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-sentinel-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Sentinel module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller-storage-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-storage-module
PKG_VERSION:=0.5
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-storage-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-storage-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Storage module
DEPENDS:= \
+foris-controller \
......
web/foris-controller/foris-controller-subordinates-module/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller-subordinates-module
PKG_VERSION:=0.2.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller-subordinates-module.git
......@@ -24,6 +24,9 @@ include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
include ../foris-controller/files/foris-controller-module.mk
define Package/foris-controller-subordinates-module
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris controller Subordinates module
DEPENDS:=\
+foris-controller \
......
web/foris-controller/foris-controller/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller
PKG_VERSION:=1.0.19
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller.git
......@@ -23,6 +23,9 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
define Package/foris-controller
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=foris-controller
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-controller
DEPENDS:=+foris-controller-app +foris-controller-hotplug
......
web/foris-controller/foris-forwarder/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-forwarder
PKG_VERSION:=0.1.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-forwarder.git
......@@ -23,6 +23,9 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
define Package/foris-forwarder
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=foris-forwarder
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-forwarder
DEPENDS:= \
......
web/foris-controller/foris-schema/Makefile
+ 4
− 1
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-schema
PKG_VERSION:=0.7.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-schema.git
......@@ -23,6 +23,9 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
define Package/foris-schema
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=Foris schema
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-schema
DEPENDS:=+python3-jsonschema
......
web/foris-controller/foris-ws/Makefile
+ 18
− 15
View file @ 53cab3bd
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=foris-ws
PKG_VERSION:=1.6.1
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/foris-controller/foris-ws.git
......@@ -23,20 +23,23 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
define Package/foris-ws
TITLE:=foris-ws
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-ws
DEPENDS:= \
+python3-light \
+python3-websockets \
+python3-prctl \
+rpcd \
+foris-client \
+python3-ubus \
+lighttpd-mod-proxy \
+fosquitto \
+python3-cachelib \
+python3-paho-mqtt
VARIANT:=python3
SECTION:=web
CATEGORY:=Web
SUBMENU:=Foris Controller
TITLE:=foris-ws
URL:=https://gitlab.nic.cz/turris/foris-controller/foris-ws
DEPENDS:= \
+python3-light \
+python3-websockets \
+python3-prctl \
+rpcd \
+foris-client \
+python3-ubus \
+lighttpd-mod-proxy \
+fosquitto \
+python3-cachelib \
+python3-paho-mqtt
VARIANT:=python3
endef
define Package/foris-ws/description
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment