From eecf924ede8b1da2dba4c2a591eeb9e1d711587c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 19 Aug 2023 17:41:57 +0200
Subject: [PATCH] build/kernel: remove WireGuard module, for now we support go
 as well; closes #376

And go doesn't work if a module is installed.  While here split the
plugins into separate code bases as there will be work incoming for
the kernel variant.
---
 build/kernel.sh          | 1 +
 config/23.7/plugins.conf | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/kernel.sh b/build/kernel.sh
index de6494b..cae2846 100644
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -67,6 +67,7 @@ SRCCONF=${CONFIGDIR}/src.conf
 ${SRCDEBUG}
 __MAKE_CONF=
 ${MAKE_ARGS_DEV}
+WITHOUT_MODULES=if_wg
 "
 
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} kernel-toolchain ${MAKE_ARGS}
diff --git a/config/23.7/plugins.conf b/config/23.7/plugins.conf
index 9d66c27..8c1ba11 100644
--- a/config/23.7/plugins.conf
+++ b/config/23.7/plugins.conf
@@ -49,8 +49,8 @@ net/tayga					arm
 net/udpbroadcastrelay				arm
 net/upnp
 net/vnstat					arm
-net/wireguard@go				arm
-net/wireguard@kmod				arm
+net/wireguard					arm
+net/wireguard-go				arm
 net/wol
 net/zerotier					arm
 security/acme-client