From 4867a75d309ed2c647a4b3020c7483c2bcd2d373 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 27 Aug 2024 09:19:39 +0200
Subject: [PATCH] plugins: do not register own name as conflict #4202

---
 Mk/plugins.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index ed4a7237d..a74b6c76f 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -71,12 +71,14 @@ PLUGIN_SUFFIX?=		-devel
 PLUGIN_VARIANT?=	${PLUGIN_VARIANTS:[1]}
 .endif
 
-.if !empty(PLUGIN_VARIANT)
+.if "${PLUGIN_VARIANT}" == ""
+.error Plugin variant cannot be empty
+.else
 PLUGIN_NAME:=		${${PLUGIN_VARIANT}_NAME}
 .if empty(PLUGIN_NAME)
 .error Plugin variant '${PLUGIN_VARIANT}' does not exist
 .endif
-.for _PLUGIN_VARIANT in ${PLUGIN_VARIANTS}
+.for _PLUGIN_VARIANT in ${PLUGIN_VARIANTS:N${PLUGIN_VARIANT}}
 PLUGIN_CONFLICTS+=	${${_PLUGIN_VARIANT}_NAME}
 .endfor
 PLUGIN_DEPENDS+=	${${PLUGIN_VARIANT}_DEPENDS}