build/make.conf: apparently it is today #210

Makefile

@@ -24,13 +24,13 @@
 # SUCH DAMAGE.
 
 STEPS=		arm base boot chroot clean clone compress confirm core \
-		distfiles download dvd fingerprint info kernel nano \
+		distfiles download dvd fingerprint info kernel make.conf nano \
 		packages plugins ports prefetch print rebase release \
 		rename rewind serial sign skim test update upload verify \
 		vga vm xtools
 SCRIPTS=	batch hotfix nightly
 
-.PHONY:		${STEPS} ${SCRIPTS} make.conf
+.PHONY:		${STEPS} ${SCRIPTS}
 
 PAGER?=		less
 
@@ -133,7 +133,6 @@ VERBOSE_HIDDEN=	@
 
 .for _VERSION in ABI LUA PERL PHP PYTHON RUBY
 VERSIONS+=	PRODUCT_${_VERSION}=${${_VERSION}}
-VERSIONS_SED+=	-e "s:%%${_VERSION}%%:${${_VERSION}}:g"
 .endfor
 
 # Expand build steps to launch into the selected
@@ -161,6 +160,3 @@ ${SCRIPT}: lint-composite
 	${VERBOSE_HIDDEN} cd ${.CURDIR} && FLAVOUR="${FLAVOUR}" \
 	    sh ${VERBOSE_FLAGS} ./composite/${SCRIPT}.sh ${${SCRIPT}_ARGS}
 .endfor
-
-make.conf:
-	@sed ${VERSIONS_SED} ${TOOLSDIR}/config/${SETTINGS}/make.conf

build/common.sh

@@ -271,7 +271,7 @@ eval export SRC$(grep ^REVISION= ${SRCDIR}/sys/conf/newvers.sh)
 export SRCABI="FreeBSD:${SRCREVISION%%.*}:${PRODUCT_ARCH}"
 
 case "${SELF}" in
-confirm|fingerprint|info|print)
+confirm|fingerprint|info|make\.conf|print)
 	;;
 *)
 	if [ -z "${PRINT_ENV_SKIP}" ]; then

build/make.conf.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Copyright (c) 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
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+SELF=make.conf
+
+. ./common.sh
+
+SED=sed
+
+for KEY in LUA PERL PHP PYTHON RUBY; do
+	eval VALUE="\${PRODUCT_${KEY}}"
+	SED="${SED} -e s:%%${KEY}%%:${VALUE}:g"
+done
+
+${SED} ${CONFIGDIR}/make.conf