From nobody Tue Apr 7 11:04:34 2026 X-Original-To: dev-commits-src-all@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 4fqjyC2l36z6Y2WQ for ; Tue, 07 Apr 2026 11:04:35 +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 4fqjyB4t37z4Jq9 for ; Tue, 07 Apr 2026 11:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775559874; 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=yTNhVpzHu5Egl5MDgqTlkUWOM8e4RSN2C38qrikKuWg=; b=i6HznXaWeGjjISQFu4JhJccMMIOh8EqsdBEPzIAsE1AUMUVrMNOOF7C05Yzn5/edMFCyDt /upf403+w8r7mAuztUshP8g3/lKn7uR8nuLDEwk+jowmLBv6RIskoHFrL+Ce2EuCMbAa8I gXquRn/Oz+/Gagl7QkydEs961bWYHWsJXyy1k8kRJDrjIwmPmYWcrWxwdHY7X5wlFrtAb5 kBFeRo6x2JDVlSnpmr8y3hjYWne5lnyr4AM0sOy5SxUgRMvTvtCqYydeOmhYow76xmun9m QG+9/xoXL15CEO7DEJ+1UQ4C8v8LgDoO+xOUHu7W6C8MTzOGgQX9XBcKV9JWkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775559874; a=rsa-sha256; cv=none; b=KSHip1nV7vTKSECfzQSJE7G/NYYQvVzLkH4o51bCRpXQpUO4Mnf7camiCS63tSp0nnzX5i sJnxcg6uWR0U1peRpVJnZWea79FTzDvtVbTfgWsr5E0Vte2vBN7qibQd5Kv/zfkFD1tIrw dlxVMolIS7DIUXCyQ9F8ft9BprhhRkoNDKdGaaBgut846sup/54xqf+LJtgayhxCMXHtze DyoUd2Ri2RWkZlirf0mxu4+XV6tUaX1WnqkvCap2ws8oJQ80Y9XvmwMK8mhQUrpt/a1Re7 I6lijQN7LiZnPZjvXAKFsBLRtny+vLn+yEgaArHUt9XKW5ES+Wyl78nzkbI2cA== 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=1775559874; 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=yTNhVpzHu5Egl5MDgqTlkUWOM8e4RSN2C38qrikKuWg=; b=fmpB1Nb4/IY3zdSlXrTw0PtPEgJMcqW+9+A3cOgVgJao2ltWLJ+LqBmHu29rD80B8BffnR afkql09lbvqun0cQi9sS6ZE5j1Q7FNhCZ+ow483LsRY2N4tYQllgZg1zaixWjFLfwQRTsc LQ3Q/SjT2fGvordpskUeu0bDNnrGl/tQd3QqdzY08vL35DlrTgem0DbuvDuneyvAvLigpX wNfO5qbpAoaPBGaL8auYZTBb4f0xqyBbbHY3cD489PMVu6zUGLq3jjTVjTCTUW2VUSfuEa 6eCnY6WCjLSPTtru37J0XegbrQht1sVKrSdxTC+sllB28Ic4GEaVA1UVdIMGQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqjyB3s01zcXw for ; Tue, 07 Apr 2026 11:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:04:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 359d6e31afe3 - main - packages: Always use the bootstrap flua List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 359d6e31afe3d28addedf9a8f550b382a5faa478 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:04:34 +0000 Message-Id: <69d4e4c2.1f5f7.c266c17@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=359d6e31afe3d28addedf9a8f550b382a5faa478 commit 359d6e31afe3d28addedf9a8f550b382a5faa478 Author: Lexi Winter AuthorDate: 2026-04-07 10:42:44 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:42:44 +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 --- 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 a976daabbaef..1edab54eeea0 100644 --- a/Makefile.inc1 +++ b/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}" \ 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}" \