build: expand all configs around the product name

build/base.sh

@@ -34,7 +34,7 @@ rm -f ${SETSDIR}/base-*-${ARCH}.txz
 git_clear ${SRCDIR}
 git_describe ${SRCDIR}
 
-MAKEARGS="SRCCONF=${TOOLSDIR}/config/current/src.conf COMPILER_TYPE=clang __MAKE_CONF="
+MAKEARGS="SRCCONF=${PRODUCT_CONFIG}/src.conf COMPILER_TYPE=clang __MAKE_CONF="
 
 make -C${SRCDIR} -j${CPUS} buildworld ${MAKEARGS} NO_CLEAN=yes
 make -C${SRCDIR}/release obj ${MAKEARGS}

build/common.sh

@@ -30,7 +30,7 @@ set -e
 # important build settings
 export PRODUCT_VERSION=${PRODUCT_VERSION:-$(date '+%Y%m%d%H%M')}
 export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR:-"OpenSSL"}
-export PRODUCT_NAME="OPNsense"
+export PRODUCT_NAME=${PRODUCT_NAME:-"OPNsense"}
 
 # full name for easy use
 export PRODUCT_RELEASE="${PRODUCT_NAME}-${PRODUCT_VERSION}_${PRODUCT_FLAVOUR}"
@@ -43,6 +43,7 @@ export SRCDIR="/usr/src"
 
 # misc. foo
 export CONFIG_PKG="/usr/local/etc/pkg/repos/${PRODUCT_NAME}.conf"
+export PRODUCT_CONFIG="${TOOLSDIR}/config/${PRODUCT_NAME}"
 export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')
 export CONFIG_XML="/usr/local/etc/config.xml"
 export ARCH=${ARCH:-$(uname -m)}

build/core.sh

@@ -62,7 +62,7 @@ while read PORT_NAME PORT_CAT PORT_OPT; do
 	fi
 
 	PORT_LIST="${PORT_LIST} ${PORT_NAME}"
-done < ${TOOLSDIR}/config/current/ports.conf
+done < ${PRODUCT_CONFIG}/ports.conf
 
 extract_packages ${STAGEDIR} opnsense
 install_packages ${STAGEDIR} ${PORT_LIST}

build/kernel.sh

@@ -37,7 +37,7 @@ git_describe ${SRCDIR}
 BUILD_KERNEL="SMP"
 
 # XXX move config to src.git
-cp ${TOOLSDIR}/config/current/${BUILD_KERNEL} ${SRCDIR}/sys/${ARCH}/conf/${BUILD_KERNEL}
+cp ${PRODUCT_CONFIG}/${BUILD_KERNEL} ${SRCDIR}/sys/${ARCH}/conf/${BUILD_KERNEL}
 
 MAKEARGS="TARGET_ARCH=${ARCH} KERNCONF=${BUILD_KERNEL}"
 

build/ports.sh

@@ -29,7 +29,7 @@ set -e
 
 . ./common.sh
 
-PORT_LIST=$(cat ${TOOLSDIR}/config/current/ports.conf)
+PORT_LIST=$(cat ${PRODUCT_CONFIG}/ports.conf)
 
 git_clear ${PORTSDIR}
 git_clear ${SRCDIR}
@@ -47,7 +47,7 @@ clean_packages ${STAGEDIR}
 
 echo ">>> Building packages..."
 
-MAKE_CONF="${TOOLSDIR}/config/current/make.conf"
+MAKE_CONF="${PRPDUCT_CONFIG}/make.conf"
 if [ -f ${MAKE_CONF} ]; then
 	cp ${MAKE_CONF} ${STAGEDIR}/etc/make.conf
 fi

scripts/port_skim.sh

@@ -27,7 +27,7 @@
 
 set -e
 
-PORT_LIST=/usr/tools/config/current/ports.conf
+PORT_LIST=/usr/tools/config/OPNsense/ports.conf
 FREEBSD=/usr/freebsd-ports
 OPNSENSE=/usr/ports