upstream/opnsense-tools
1
0
Fork 0
mirror of https://github.com/opnsense/tools.git synced 2026-05-28 04:35:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

composite: support more flexibility in custom/factory builds

Browse source
This commit is contained in:
Franco Fichtner 2026-04-21 15:31:17 +02:00
parent be63f995b5
commit bf85679027
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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}" != ""

5
composite/custom.sh
View file

@ -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}"

7
composite/factory.sh
View file

@ -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}"