From nobody Fri Oct 03 00:30:41 2025 X-Original-To: dev-commits-src-main@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 4cd8hf1TLZz6BQHv; Fri, 03 Oct 2025 00:30:42 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cd8hf0KdYz45Bm; Fri, 03 Oct 2025 00:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759451442; 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=22xgp4MH9HCoF4QrIqp3j3kUxJTZEDmDsG1qV0hh+Vs=; b=u+PCOJaQYq6m1vLGsjI4vhYlt4ImS2lxOZFZYD58/FCGxLnS6FgpB3yjGUUQJ3NlEGSgdz FbFYcCjtlndYHxGnCJvfr8vFGJcItiG3PMzy9c+KcFdxjCBN/RHa2y2s6nCELlWudY7qCL xmVkA8NE/jae3Qx8/Jo0Sy3B+nf1eOLSCMbqzCfruegnS9pGy9A0mz0MJztV9oY/SYNbsR ivpBgeBsF+1ZbIs+paBTJn4uMgGq9+sqf6D7hKhEScTlu8SbLeN+KfcS4yy9FKLhFx4To7 BCJHCXIeoiyz044f1nUKKmY/4WWheeHgx7OODd5etHjuzmv+ISmvqJ1N4PGtRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759451442; 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=22xgp4MH9HCoF4QrIqp3j3kUxJTZEDmDsG1qV0hh+Vs=; b=UvgjSB1hasrOUAbsJbVAM47EFwkrm9SHq+7f9MFPUpr52pYlq3DRV6FC/7dyNh+IsM5oIF oR/Ifk+L+5qkSj5nVe0FB8eblnRAIpX7gF59UHOPKs9CT2KrIYvahJc3Fm7hjpqPRkz3st U4PamqlGhrrQGe0xrUoEsGxbUsyL9+J5T8/DvtAVPVsC0X8Lgz5rI21tBnWssPyeBOIAxS ZHxRY0dp3BKijtcUOa0uRCuTMeFk5pMYeqQNdepmtweOpVZw+EXxXt3t7mcu5ZBP4cD3VR zvn+QSZo2kol4g5+oA8oOtRmq6CUq86AHyf1IwZjDq9zptoDByy8fNdneqNLtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759451442; a=rsa-sha256; cv=none; b=NptpGCwIYSsiIGQxYDggHKfJmPlAFjXo4dwh6N4uo4A62EDvnAdmsr79ghwh1NydFGSeRT jE7RAkoL5jiAq1JsKVq7brD79LENERHJHJHfGfNSeiNQj3NwAQ4emuDKqTz79dYeFaDYyx l5H6akYPpXbrMKhUQ31zQ31FD3rT77Hemn3rzP++NtinpT0jpVAVwcs0D67evFvzWO4Qgq o77liffj0UuT6BgDeUuGxYomM3zyd7ErTFhspulXre1iUhjwIugyLz1fFDM5Liqwz/no6E q1Tr3MV5TtBShnYy7BDf8NXTGpLF0hS1mWZfzu6mFWiPJtLp7DQmADqCqOyWLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cd8hd72pzzXKL; Fri, 03 Oct 2025 00:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5930UfbB007060; Fri, 3 Oct 2025 00:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5930UfVr007057; Fri, 3 Oct 2025 00:30:41 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:30:41 GMT Message-Id: <202510030030.5930UfVr007057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5c5c0571c298 - main - release: Fix NO_ROOT cross-building VM images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c5c0571c2984669024dca5356f973ffc18a3e02 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5c5c0571c2984669024dca5356f973ffc18a3e02 commit 5c5c0571c2984669024dca5356f973ffc18a3e02 Author: Ed Maste AuthorDate: 2025-10-02 22:07:04 +0000 Commit: Ed Maste CommitDate: 2025-10-03 00:30:07 +0000 release: Fix NO_ROOT cross-building VM images Pass PKG_ABI to virtual machine image builds. Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52874 --- release/Makefile | 15 ++++++++------- release/Makefile.vm | 2 ++ release/tools/vmimage.subr | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile b/release/Makefile index f907bf985893..70e5795bae0f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -75,11 +75,19 @@ VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} .endfor .endif +.if !defined(NOPKGBASE) || empty(NOPKGBASE) +PKGBASE_REPO_DIR= pkgbase-repo-dir +WSTAGEDIR!= ${IMAKE} -f Makefile.inc1 -C ${WORLDDIR} -V WSTAGEDIR +PKG_ABI_FILE= ${WSTAGEDIR}/usr/bin/uname +PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI) +.endif + .if ${.MAKE.OS} == "FreeBSD" # For installing packages into the release media. PKG_ENV+= INSTALL_AS_USER=yes PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -o METALOG=METALOG +PKG_ARGS+= -o ABI=${PKG_ABI} PKG_ARGS+= -r ${.TARGET} PKG_REPO_ARGS= -o REPOS_DIR=${.CURDIR}/pkg_repos PKGBASE_REPO_ARGS=-o REPOS_DIR=${.OBJDIR}/pkgbase-repo-dir @@ -194,13 +202,6 @@ bootonly: packagesystem dvd: packagesystem .endif -.if !defined(NOPKGBASE) || empty(NOPKGBASE) -PKGBASE_REPO_DIR= pkgbase-repo-dir -WSTAGEDIR!= ${IMAKE} -f Makefile.inc1 -C ${WORLDDIR} -V WSTAGEDIR -PKG_ABI_FILE= ${WSTAGEDIR}/usr/bin/uname -PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI) -.endif - pkgbase-repo: mkdir -p pkgbase-repo mkdir -p /tmp/ports /tmp/distfiles diff --git a/release/Makefile.vm b/release/Makefile.vm index eafd1d6abf71..336e8fc82299 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -134,6 +134,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR} ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${NO_ROOT:DNO_ROOT=true} \ PKG_CMD=${PKG_CMD:Upkg} \ + PKG_ABI=${PKG_ABI} \ PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}/etc/pkg} \ PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \ PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ @@ -192,6 +193,7 @@ vm-image: ${QEMUTGT} ${PKGBASE_REPO_DIR} ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${NO_ROOT:DNO_ROOT=true} \ PKG_CMD=${PKG_CMD:Upkg} \ + PKG_ABI=${PKG_ABI} \ PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}-${FORMAT}-${FS}/etc/pkg} \ PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \ PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 577abaac73cf..f307e7888e93 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -94,7 +94,7 @@ vm_install_base() { local pkg_cmd pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes - -o INSTALL_AS_USER=yes " + -o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes " $pkg_cmd update selected=$($pkg_cmd rquery -U -r FreeBSD-base %n | \ vm_filter_base_packages | vm_extra_filter_base_packages) @@ -198,6 +198,7 @@ vm_extra_install_packages() { for pkg in ${VM_EXTRA_PACKAGES}; do INSTALL_AS_USER=yes \ ${PKG_CMD} \ + -o ABI=${PKG_ABI} \ -o METALOG=${DESTDIR}/METALOG.pkg \ -o REPOS_DIR=${PKG_REPOS_DIR} \ -o PKG_DBDIR=${DESTDIR}/var/db/pkg \