build: remove remnants of FLAVOUR handling

Makefile

@@ -79,7 +79,6 @@ _CONFIGDIR=	${DIR:C/\/build\.conf$//}
 NAME?=		OPNsense
 TYPE?=		${NAME:tl}
 SUFFIX?=	# empty
-FLAVOUR=	OpenSSL # XXX only flavour now, perhaps refactor
 _ARCH!=		uname -p
 ARCH?=		${_ARCH}
 ABI?=		${_CONFIGDIR:C/^.*\///}
@@ -167,7 +166,7 @@ VERSIONS+=	PRODUCT_${_VERSION}=${${_VERSION}}
 ${STEP}: lint-steps
 	${VERBOSE_HIDDEN} cd ${.CURDIR}/build && \
 	    sh ${VERBOSE_FLAGS} ./${.TARGET}.sh -a ${ARCH} -F ${KERNEL} \
-	    -f "${FLAVOUR}" -n ${NAME} -v "${VERSIONS}" -s ${_CONFIGDIR} \
+	    -n ${NAME} -v "${VERSIONS}" -s ${_CONFIGDIR} \
 	    -S ${SRCDIR} -P ${PORTSDIR} -p ${PLUGINSDIR} -T ${TOOLSDIR} \
 	    -C ${COREDIR} -R ${PORTSREFDIR} -t ${TYPE} -k "${PRIVKEY}" \
 	    -K "${PUBKEY}" -l "${SIGNCHK}" -L "${SIGNCMD}" -d ${DEVICE} \

build/common.sh

@@ -28,7 +28,7 @@
 
 set -e
 
-OPTS="A:a:B:b:C:c:D:d:E:e:F:f:G:g:H:h:I:J:K:k:L:l:m:n:O:o:P:p:R:r:S:s:T:t:U:u:v:V:"
+OPTS="A:a:B:b:C:c:D:d:E:e:F:G:g:H:h:I:J:K:k:L:l:m:n:O:o:P:p:R:r:S:s:T:t:U:u:v:V:"
 
 while getopts ${OPTS} OPT; do
 	case ${OPT} in
@@ -68,9 +68,6 @@ while getopts ${OPTS} OPT; do
 	F)
 		export PRODUCT_KERNEL=${OPTARG}
 		;;
-	f)
-		export PRODUCT_FLAVOUR=${OPTARG}
-		;;
 	G)
 		export PORTSREFBRANCH=${OPTARG}
 		;;
@@ -190,7 +187,6 @@ PRODUCT_ABI
 PRODUCT_ARCH
 PRODUCT_COMSPEED
 PRODUCT_DEVICE_REAL
-PRODUCT_FLAVOUR
 PRODUCT_GITBASE
 PRODUCT_KERNEL
 PRODUCT_LUA
@@ -247,7 +243,7 @@ fi
 . ${DEVICEDIR}/${PRODUCT_DEVICE_REAL}.conf
 
 # define and bootstrap target directories
-export STAGEDIR="${STAGEDIRPREFIX}${CONFIGDIR}/${PRODUCT_FLAVOUR}:${PRODUCT_ARCH}"
+export STAGEDIR="${STAGEDIRPREFIX}${CONFIGDIR}/${PRODUCT_ARCH}"
 export TARGETDIRPREFIX="/usr/local/opnsense/build"
 export TARGETDIR="${TARGETDIRPREFIX}/${PRODUCT_SETTINGS}/${PRODUCT_ARCH}"
 export IMAGESDIR="${TARGETDIR}/images"
@@ -260,7 +256,7 @@ export PRODUCT_PRIVKEY=${PRODUCT_PRIVKEY:-"${CONFIGDIR}/repo.key"}
 export PRODUCT_PUBKEY=${PRODUCT_PUBKEY:-"${CONFIGDIR}/repo.pub"}
 export PRODUCT_SIGNCMD=${PRODUCT_SIGNCMD:-"${TOOLSDIR}/scripts/pkg_sign.sh ${PRODUCT_PUBKEY} ${PRODUCT_PRIVKEY}"}
 export PRODUCT_SIGNCHK=${PRODUCT_SIGNCHK:-"${TOOLSDIR}/scripts/pkg_fingerprint.sh ${PRODUCT_PUBKEY}"}
-export PRODUCT_RELEASE="${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}"
+export PRODUCT_RELEASE="${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}"
 export PRODUCT_CORES="${PRODUCT_TYPE} ${PRODUCT_TYPE}-devel ${PRODUCT_TYPE}-business"
 export PRODUCT_CORE="${PRODUCT_TYPE}${PRODUCT_SUFFIX}"
 export PRODUCT_DEVEL="${PRODUCT_SUFFIX%-business}"

build/core.sh

@@ -55,7 +55,7 @@ for BRANCH in ${EXTRABRANCH} ${COREBRANCH}; do
 	setup_copy ${STAGEDIR} ${COREDIR}
 	git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
 
-	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} CORE_FLAVOUR=${PRODUCT_FLAVOUR} ${COREENV}"
+	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} ${COREENV}"
 	if [ ${BRANCH} = ${COREBRANCH} ]; then
 		CORE_ARGS="${CORE_ARGS} ${CORE_PKGVERSION}"
 	fi

build/plugins.sh

@@ -59,7 +59,7 @@ for BRANCH in ${EXTRABRANCH} ${PLUGINSBRANCH}; do
 	setup_copy ${STAGEDIR} ${PLUGINSDIR}
 	git_reset ${STAGEDIR}${PLUGINSDIR} ${BRANCH}
 
-	_PLUGIN_ARGS="PLUGIN_ARCH=${PRODUCT_ARCH} PLUGIN_FLAVOUR=${PRODUCT_FLAVOUR} ${PLUGINSENV}"
+	_PLUGIN_ARGS="PLUGIN_ARCH=${PRODUCT_ARCH} ${PLUGINSENV}"
 
 	for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
 		VARIANT=${PLUGIN_ORIGIN##*@}

build/rename.sh

@@ -37,7 +37,7 @@ for ARG in ${@}; do
 		echo ">>> Renaming arm image: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-arm-${PRODUCT_ARCH}-${PRODUCT_DEVICE}.*"); do
-		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-arm-${FILE##*-arm-}
+		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-arm-${FILE##*-arm-}
 		done
 		;;
 	base)
@@ -67,7 +67,7 @@ for ARG in ${@}; do
 		echo ">>> Renaming dvd image: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-dvd-${PRODUCT_ARCH}.*"); do
-		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-dvd-${FILE##*-}
+		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-dvd-${FILE##*-}
 		done
 		;;
 	kernel)
@@ -95,7 +95,7 @@ for ARG in ${@}; do
 		echo ">>> Renaming nano image: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-nano-${PRODUCT_ARCH}.*"); do
-		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-nano-${FILE##*-}
+		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-nano-${FILE##*-}
 		done
 		;;
 	packages)
@@ -109,21 +109,21 @@ for ARG in ${@}; do
 		echo ">>> Renaming serial image: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-serial-${PRODUCT_ARCH}.*"); do
-		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-serial-${FILE##*-}
+		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-serial-${FILE##*-}
 		done
 		;;
 	vga)
 		echo ">>> Renaming vga image: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-vga-${PRODUCT_ARCH}.*"); do
-		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-vga-${FILE##*-}
+		    mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-vga-${FILE##*-}
 		done
 		;;
 	vm)
 		echo ">>> Renaming vm set: ${PRODUCT_VERSION}"
 		for FILE in $(find ${IMAGESDIR} -name \
 		    "*-vm-${PRODUCT_ARCH}.*"); do
-			mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-vm-${FILE##*-}
+			mv ${FILE} ${IMAGESDIR}/${PRODUCT_NAME}${PRODUCT_SUFFIX}-${PRODUCT_VERSION}-vm-${FILE##*-}
 		done
 		;;
 	esac