config: untangle SETTINGS and ABI

In case we want a custom config directory but a matching ABI.

Makefile

@@ -69,6 +69,7 @@ SUFFIX?=	#-devel
 FLAVOUR?=	OpenSSL LibreSSL # first one is default
 _ARCH!=		uname -p
 ARCH?=		${_ARCH}
+ABI?=		${SETTINGS}
 KERNEL?=	SMP
 ADDITIONS?=	os-dyndns${SUFFIX}
 DEVICE?=	A10
@@ -132,10 +133,7 @@ VERBOSE_FLAGS=	-x
 VERBOSE_HIDDEN=	@
 .endif
 
-VERSIONS=	PRODUCT_ABI=${SETTINGS}
-VERSIONS_SED=	-e "s:%%ABI%%:${SETTINGS}:g"
-
-.for _VERSION in LUA PERL PHP PYTHON RUBY
+.for _VERSION in ABI LUA PERL PHP PYTHON RUBY
 VERSIONS+=	PRODUCT_${_VERSION}=${${_VERSION}}
 VERSIONS_SED+=	-e "s:%%${_VERSION}%%:${${_VERSION}}:g"
 .endfor

README.md

@@ -52,6 +52,7 @@ Available early build options are:
 
 Available build options are:
 
+* ABI:		a custom ABI (defaults to SETTINGS)
 * ADDITIONS:	a list of packages/plugins to add to images
 * ARCH:		the target architecture if not native
 * DEVICE:	loads device-specific modifications, e.g. "A10" (default)

build/prefetch.sh

@@ -33,7 +33,7 @@ SELF=prefetch
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 
-MIRRORSETDIR="${PRODUCT_MIRROR}/${SRCABI}/${PRODUCT_SETTINGS}/sets"
+MIRRORSETDIR="${PRODUCT_MIRROR}/${SRCABI}/${PRODUCT_ABI}/sets"
 
 if [ -z "${VERSION}" ]; then
 	VERSION=${PRODUCT_ABI}

build/release.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -80,7 +80,7 @@ if [ -f "${PRODUCT_PRIVKEY}" ]; then
 	# checked for private key, but want the public key to
 	# be able to verify the images on the mirror later on
 	cp "${PRODUCT_PUBKEY}" \
-	    "${STAGEDIR}/work/${PRODUCT_NAME}-${PRODUCT_SETTINGS}.pub"
+	    "${STAGEDIR}/work/${PRODUCT_NAME}-${PRODUCT_ABI}.pub"
 fi
 
 echo -n ">>> Bundling images for ${PRODUCT_RELEASE}... "