From bf8567902745c2dd1bbb6940827e2616b8e893f3 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 21 Apr 2026 15:31:17 +0200
Subject: [PATCH] composite: support more flexibility in custom/factory builds

---
 Makefile             | 2 ++
 composite/custom.sh  | 5 +++--
 composite/factory.sh | 7 ++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 5c6bb36..55a3eee 100644
--- a/Makefile
+++ b/Makefile
@@ -158,6 +158,7 @@ release: dvd nano serial vga
 
 .for TARGET in ${.TARGETS}
 _TARGET=	${TARGET:C/\-.*//}
+.if ${_TARGET:tl} == ${_TARGET}
 .if ${_TARGET} != ${TARGET}
 .if ${SCRIPTS:M${_TARGET}}
 ${_TARGET}_ARGS+=	${TARGET:C/^[^\-]*(\-|\$)//}
@@ -166,6 +167,7 @@ ${_TARGET}_ARGS+=	${TARGET:C/^[^\-]*(\-|\$)//:S/,/ /g}
 .endif
 ${TARGET}: ${_TARGET}
 .endif
+.endif
 .endfor
 
 .if "${VERBOSE}" != ""
diff --git a/composite/custom.sh b/composite/custom.sh
index 0091e11..6fae1e6 100644
--- a/composite/custom.sh
+++ b/composite/custom.sh
@@ -31,7 +31,7 @@ set -e
 
 IMAGE=${1}
 
-load_make_vars PLUGINSDIR PLUGINSENV
+load_make_vars PLUGINSDIR PLUGINSENV PRODUCT_SUFFIX
 
 # handle path-based plugins as custom install for target image
 MISSING=
@@ -80,4 +80,5 @@ else
 	_IMAGE=${IMAGE}
 fi
 
-make clean-${_IMAGE} ${IMAGE} ADDITIONS="${ADDITIONS}" SUFFIX="${SUFFIX}"
+make clean-${_IMAGE} ${IMAGE} ADDITIONS="${ADDITIONS}" \
+    NAMESUFFIX="${NAMESUFFIX}" SUFFIX="${PRODUCT_SUFFIX}"
diff --git a/composite/factory.sh b/composite/factory.sh
index 6693ef5..67fa68a 100644
--- a/composite/factory.sh
+++ b/composite/factory.sh
@@ -27,7 +27,7 @@
 
 . $(dirname ${0})/util.sh
 
-load_make_vars PRODUCT_ARCH PRODUCT_CORE PRODUCT_ZFS_REQUESTED SETSDIR
+load_make_vars PRODUCT_ARCH PRODUCT_CORE PRODUCT_SUFFIX PRODUCT_ZFS_REQUESTED SETSDIR
 
 CORE_VERSION=$(load_core_version ${SETSDIR} ${PRODUCT_ARCH} ${PRODUCT_CORE})
 
@@ -36,5 +36,6 @@ if [ -n "${PRODUCT_ZFS_REQUESTED}" ]; then
 	FS=zfs
 fi
 
-make vm-raw,4G,never,serial compress-vm VERSION=${CORE_VERSION}-${FS} \
-    ADDITIONS="${ADDITIONS}" SUFFIX="${SUFFIX}"
+make vm-raw,4G,never,serial compress-vm \
+    VERSION=${CORE_VERSION}${NAMESUFFIX}-${FS} \
+    ADDITIONS="${ADDITIONS}" SUFFIX="${PRODUCT_SUFFIX}"