From nobody Sun Apr 12 23:15:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wp0fs8z6Z6kN for ; Sun, 12 Apr 2026 23:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv5wn4LrLz3NTC for ; Sun, 12 Apr 2026 23:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OilSMOW2H6SlirHnJhKeA7S7t4Y4YkEACwVeVtepumY=; b=StZWeJxTNO5mNyTfu01vW4U0ceuXqbX91L8QufS3v2uNBMe03o71WFDQTfk/UvjcXlm2I7 m48sboRM4ju69T5Ozw+x3oC6ZPcNqu/Gj6lN0gIO7fTzvOOfTZE9ItPTOfrmzJaOcATjee Lb9QgDQ7F3qITvoRr55A+ubnUyAB9RkhsLJ2GZ28GCkgfH7bw8Dv0LZ++PN3iT1zmLKJ5c Ostlmpgdt2aPdVyf62aiCoZnW565hxz8FIypJJc08+KcfrFvkhXN2BqHqLP8DHe3gObnhy 5FKdC5IEwPG08XX3mtYTjX0kZpgr0NF9XzvqyiBdQmQ019faFD24Ukw6NWXNkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776035705; a=rsa-sha256; cv=none; b=QKB1ZVhO9PzrjLEt/fhx+RWc2MQpiY9NXkWi4mA8x3gUcHxXb4USLoq66zU7/yiWpo2gw5 GRNt/kr7gLaLRA4tOhieROTc1xU116G3BAF5Kw0nQDLYzi7h+14miqfXx5MD0YOX3S41GX 9CVdNeaxfauL2mfjxnEQ5Yz8wqL9UP5s82Gg87/qALGM+Dd6ZoFxuM6tuNjP89IuPLOl1d 6iaWgJ4txTRgcdS08nKzd24ZuCGWRqZxE3Cj6DsZ6XG7QdYBMIVlHAJS6rHkhVD19qvNAX 9lW5v4mnE3/XXkCZfgk+M2vP/K1ate/efFjswH73lfe9hUBcomQ8QQNGVlKGsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OilSMOW2H6SlirHnJhKeA7S7t4Y4YkEACwVeVtepumY=; b=RbDWwHJXkp/icb2tMIlfnSUbiocEJH51V/PXFW13osnmchK/Ugmo6h1HXLw7YvqTaAWfJb WFUI6XMNatscznM0TXrhTCMGoM38A2DL5yZCm60gCOwGjiONFl7OaxHGOaPTJXDIz+GedT yc5ymes79zYR4PetNwUKzKGtHx3Y52GnUTTM4nzOJBlV1wH5Lq8esmuKI1KfyBqL5WD2+i 3n04664Dcn7Bi8jKOrAq1hcsy3z/fObQMtKxaish6X/rYc5rg2wi/kK7quS7t2lztLIihr 36qS0xXoyJkcYo9Z45ewqwazWuUfw04aycXSGkzOAmkih23+b2MsyT993IOEuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wn3dSYzdm8 for ; Sun, 12 Apr 2026 23:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25477 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 23:15:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1ff7f5562d64 - stable/15 - packages: Always use the bootstrap flua List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 23:15:05 +0000 Message-Id: <69dc2779.25477.1bc8062d@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 commit 1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 Author: Lexi Winter AuthorDate: 2026-04-07 10:42:44 +0000 Commit: Lexi Winter CommitDate: 2026-04-12 19:12:16 +0000 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 (cherry picked from commit 359d6e31afe3d28addedf9a8f550b382a5faa478) --- Makefile.inc1 | 21 +++++++++++---------- release/packages/create-sets.sh | 2 +- release/packages/generate-ucl.sh | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 04aaf28ae19c..79eaf94fc9ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2161,7 +2161,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 @@ -2170,13 +2170,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} \ @@ -2190,7 +2190,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} \ @@ -2205,7 +2205,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}" \ @@ -2231,7 +2231,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}" \ @@ -2263,7 +2263,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= @@ -2323,7 +2324,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}" \ @@ -2357,7 +2358,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}" \ @@ -2396,7 +2397,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}" \ diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh index 3780e8ee46c6..46dfd543619c 100755 --- a/release/packages/create-sets.sh +++ b/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" \ diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index a08840d5b321..de6bc7a70eb3 100755 --- a/release/packages/generate-ucl.sh +++ b/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}" \