From 4e02760a66cefb6c7e71aeb888bca39c3479b7ce Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 5 Jan 2024 09:31:02 +0100
Subject: [PATCH] build/kernel: make the if_wg module workaround flexible

---
 build/kernel.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/kernel.sh b/build/kernel.sh
index ec9ec2a..0720ccb 100644
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2022 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2024 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -59,7 +59,6 @@ else
 	echo ">>> Attempting to use external kernel: ${PRODUCT_KERNEL}"
 fi
 
-# XXX remove WITHOUT_MODULES for wireguard ports removal
 MAKE_ARGS="
 TARGET_ARCH=${PRODUCT_ARCH}
 TARGET=${PRODUCT_TARGET}
@@ -68,9 +67,13 @@ SRCCONF=${CONFIGDIR}/src.conf
 ${SRCDEBUG}
 __MAKE_CONF=
 ${MAKE_ARGS_DEV}
-WITHOUT_MODULES=if_wg
 "
 
+# XXX wireguard module glue for 23.x builds
+if [ ${PRODUCT_ABI%%.*} -lt 24 ]; then
+	MAKE_ARGS="${MAKE_ARGS}WITHOUT_MODULES=if_wg"
+fi
+
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} kernel-toolchain ${MAKE_ARGS}
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS}
 if [ "${1}" = "build" ]; then