packages: Always use the bootstrap flua

To avoid breaking the build due to incompatible changes in flua or lua
libraries on the host, use the bootstrap flua for the package build.

MFC after:	2 weeks
Reviewed by:	kevans, emaste
Sponsored by:	https://www.patreon.com/bsdivy
Differential Revision:	https://reviews.freebsd.org/D56271

Makefile.inc1

@@ -2162,7 +2162,7 @@ _repodir: .PHONY
 
 create-packages-world:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 \
+		PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
 			DESTDIR=${WSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} create-world-packages
 
@@ -2171,13 +2171,13 @@ create-packages-world:	_pkgbootstrap _repodir .PHONY
 .ORDER: create-packages-source create-packages-sets
 create-packages-sets:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 \
+		PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
 			DESTDIR=${WSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} create-sets-packages
 
 create-packages-kernel:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 \
+		PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
 			DESTDIR=${KSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
 			SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
@@ -2191,7 +2191,7 @@ create-packages-sets-repo: .PHONY create-packages-sets sign-packages
 
 create-packages-source:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 \
+		PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
 			DESTDIR=${SSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} \
 			SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
@@ -2206,7 +2206,7 @@ create-source-src-package: _pkgbootstrap .PHONY
 		( echo "@override_prefix /usr/src" ;  \
 		${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \
 		> ${SSTAGEDIR}/src.plist
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	flua ${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "src" \
 		PKGGENNAME "src" \
 		VERSION "${PKG_VERSION}" \
@@ -2232,7 +2232,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY
 		( echo "@override_prefix /usr/src" ; \
 		${GIT_CMD} ls-files --recurse-submodules "sys/" ) \
 		> ${SSTAGEDIR}/src-sys.plist
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	flua ${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "src-sys" \
 		PKGGENNAME "src-sys" \
 		VERSION "${PKG_VERSION}" \
@@ -2264,7 +2264,8 @@ create-world-packages:	_pkgbootstrap .PHONY
 	  echo "_PKGS+= $${pkgname}" ; \
 	done > ${WSTAGEDIR}/packages.mk
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 create-world-packages-jobs \
+		PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
+		create-world-packages-jobs \
 		SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
 		.MAKE.JOB.PREFIX=
 
@@ -2324,7 +2325,7 @@ _debug=-dbg
 
 create-dtb-package:	.PHONY
 	@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+		flua ${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "dtb" \
 		PKGGENNAME "dtb" \
 		VERSION "${PKG_VERSION}" \
@@ -2358,7 +2359,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
 	${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	flua ${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \
 		PKGGENNAME "kernel" \
 		VERSION "${PKG_VERSION}" \
@@ -2400,7 +2401,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
 	${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${_kernel} ; \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	flua ${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "kernel-${_kernel:tl}${flavor}" \
 		PKGGENNAME "kernel" \
 		FORCEINCLUDE "kernel${flavor}" \

release/packages/create-sets.sh

@@ -57,7 +57,7 @@ for set in $(echo $SETS | tr ' ' '\n' | sort | uniq); do
 	setvar="$(echo "$set" | tr - _)"
 	eval deps=\"\$PKGS_${setvar}\"
 
-	"${srcdir}/release/packages/generate-set-ucl.lua" \
+	flua "${srcdir}/release/packages/generate-set-ucl.lua" \
 		"${srcdir}/release/packages/set-template.ucl" \
 		PKGNAME "$set" \
 		SET_DEPENDS "$deps" \

release/packages/generate-ucl.sh

@@ -82,7 +82,7 @@ main() {
 	fi
 
 	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
-	${srctree}/release/packages/generate-ucl.lua \
+	flua ${srctree}/release/packages/generate-ucl.lua \
 		VERSION "${PKG_VERSION}" \
 		PKGNAME "${origname}" \
 		PKGGENNAME "${outname}" \