From f04504535434798c92b5b95ca2431d985d13179e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 18 Jan 2023 14:57:05 +0100 Subject: [PATCH] plugins: annotate support tier levels in plugins PR: https://github.com/opnsense/core/issues/5983 --- Mk/defaults.mk | 1 + Mk/plugins.mk | 1 + Templates/version | 1 + devel/debug/Makefile | 1 + net/firewall/Makefile | 1 + net/frr/Makefile | 1 + net/relayd/Makefile | 2 +- security/etpro-telemetry/Makefile | 1 + security/stunnel/Makefile | 1 + security/tinc/Makefile | 1 + sysutils/git-backup/Makefile | 1 + sysutils/vmware/Makefile | 1 + 12 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 9a8e0fdec..9c2410f74 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -89,6 +89,7 @@ REPLACEMENTS= PLUGIN_ABI \ PLUGIN_NAME \ PLUGIN_PKGNAME \ PLUGIN_PKGVERSION \ + PLUGIN_TIER \ PLUGIN_VARIANT \ PLUGIN_WWW diff --git a/Mk/plugins.mk b/Mk/plugins.mk index 9925f2bd8..ca9a51fc6 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -44,6 +44,7 @@ PLUGIN_SCRIPTS= +PRE_INSTALL +POST_INSTALL \ +PRE_DEINSTALL +POST_DEINSTALL PLUGIN_WWW?= https://opnsense.org/ +PLUGIN_TIER?= 3 PLUGIN_REVISION?= 0 PLUGIN_REQUIRES= PLUGIN_NAME PLUGIN_VERSION PLUGIN_COMMENT \ diff --git a/Templates/version b/Templates/version index 95baa8fe0..f03ab1fa7 100644 --- a/Templates/version +++ b/Templates/version @@ -6,6 +6,7 @@ "product_hash": "%%PLUGIN_HASH%%", "product_id": "%%PLUGIN_PKGNAME%%", "product_name": "%%PLUGIN_NAME%%", + "product_tier": "%%PLUGIN_TIER%%", "product_version": "%%PLUGIN_PKGVERSION%%", "product_website": "%%PLUGIN_WWW%%" } diff --git a/devel/debug/Makefile b/devel/debug/Makefile index ddbc36c4b..0348b91ee 100644 --- a/devel/debug/Makefile +++ b/devel/debug/Makefile @@ -7,5 +7,6 @@ PLUGIN_DEPENDS= php${PLUGIN_PHP}-pear-PHP_CodeSniffer \ py${PLUGIN_PYTHON}-pycodestyle \ p5-File-Slurp git PLUGIN_MAINTAINER= franco@opnsense.org +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/net/firewall/Makefile b/net/firewall/Makefile index 6e344f254..d63450cec 100644 --- a/net/firewall/Makefile +++ b/net/firewall/Makefile @@ -2,5 +2,6 @@ PLUGIN_NAME= firewall PLUGIN_VERSION= 1.2 PLUGIN_COMMENT= Firewall API supplemental package PLUGIN_MAINTAINER= ad@opnsense.org +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/net/frr/Makefile b/net/frr/Makefile index f623b151b..e6b8b5903 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -3,5 +3,6 @@ PLUGIN_VERSION= 1.31 PLUGIN_COMMENT= The FRRouting Protocol Suite PLUGIN_DEPENDS= frr7 PLUGIN_MAINTAINER= franz.fabian.94@gmail.com +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/net/relayd/Makefile b/net/relayd/Makefile index 29e7ac472..93bb7a3fd 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -1,8 +1,8 @@ PLUGIN_NAME= relayd PLUGIN_VERSION= 2.7 -#PLUGIN_REVISION= 1 PLUGIN_DEPENDS= relayd PLUGIN_COMMENT= Relayd Load Balancer PLUGIN_MAINTAINER= frank.brendel@eurolog.com +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/security/etpro-telemetry/Makefile b/security/etpro-telemetry/Makefile index c3bac8a52..f23b64f88 100644 --- a/security/etpro-telemetry/Makefile +++ b/security/etpro-telemetry/Makefile @@ -4,5 +4,6 @@ PLUGIN_REVISION= 1 PLUGIN_COMMENT= ET Pro Telemetry Edition PLUGIN_MAINTAINER= ad@opnsense.org PLUGIN_WWW= https://docs.opnsense.org/manual/etpro_telemetry.html +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 304126be7..2f7b74f0c 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -4,5 +4,6 @@ PLUGIN_REVISION= 1 PLUGIN_COMMENT= Stunnel TLS proxy PLUGIN_MAINTAINER= ad@opnsense.org PLUGIN_DEPENDS= stunnel +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/security/tinc/Makefile b/security/tinc/Makefile index 403bbbc5f..506eb42e9 100644 --- a/security/tinc/Makefile +++ b/security/tinc/Makefile @@ -4,5 +4,6 @@ PLUGIN_REVISION= 4 PLUGIN_COMMENT= Tinc VPN PLUGIN_DEPENDS= tinc PLUGIN_MAINTAINER= ad@opnsense.org +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/sysutils/git-backup/Makefile b/sysutils/git-backup/Makefile index 38c14397b..9c31c558f 100644 --- a/sysutils/git-backup/Makefile +++ b/sysutils/git-backup/Makefile @@ -4,5 +4,6 @@ PLUGIN_REVISION= 3 PLUGIN_COMMENT= Track config changes using git PLUGIN_DEPENDS= git PLUGIN_MAINTAINER= ad@opnsense.org +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk" diff --git a/sysutils/vmware/Makefile b/sysutils/vmware/Makefile index 307d0f9bf..92bf19ab6 100644 --- a/sysutils/vmware/Makefile +++ b/sysutils/vmware/Makefile @@ -4,5 +4,6 @@ PLUGIN_REVISION= 1 PLUGIN_COMMENT= VMware tools PLUGIN_DEPENDS= open-vm-tools-nox11 PLUGIN_MAINTAINER= franco@opnsense.org +PLUGIN_TIER= 2 .include "../../Mk/plugins.mk"