From nobody Tue Sep 16 20:50:54 2025 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 4cRDZR1nBYz68332; Tue, 16 Sep 2025 20:50:55 +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 4cRDZQ69JLz3Vck; Tue, 16 Sep 2025 20:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758055854; 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=IR6HVpQjUtKn8fFh12dH/c/w7rKLkni+UUskqc3GSYk=; b=pNOdOPF7LZ6MOYHolSLuxnl6/8Swh4Fn4S/FDt8Xlw6xr4RFnEkZugdMSyZfLYgBNP3yf4 c3tChwAhH4TaAOaAMBY83XU58TAN0Nen82iXXkIQuQkUvTyXcLv6jGiztNH9wHQIGllWoD AGpBfpWFl+9MMEBqWoiTrhlETI102oeZHbzoUJQSDgoy3Ck5rYIt5UzagxwSJy3dWOB2R6 ece1pfVUW5HWyee6AuG8JlbXq3ZuJIOGfDwxCr6/qQcMENsn5odNPovLFCdZy382usVnpz BvykVF75N9Icfykx7s3+rJyU1iCHETNYJsVoeSVUH1/v97MChkb9LNGHen4P2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758055854; 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=IR6HVpQjUtKn8fFh12dH/c/w7rKLkni+UUskqc3GSYk=; b=WC1xx04qgQxyuVR4XTyWbc3DZb4Ef6GlMm0klXM7OPgftNOlqbBp4dcpIqtyD3YZHdsp9v 3tBfHGjRA/KkKilup/+/pgJzRpOFkzJ2yzc6nQqiOkZmHwdmmICSgsaYE3zzKWFSRwap2/ /GkyXsliUuvzOmEKx8ex2HM9RRssNew6i+AEvkn6UcYPRBZYSRUPZ/5uG9OeVuG5mStgn9 25wepQCSfdfouN8o3Q42dWdkxP6VYzAaOroPE5FozfNZN54VfljWncpWUW5p3NTf5ZVelw Tl40up9JMX1g0DVD9gXSxqe8XhdvsVyXEqSwEO5jaTkHLK+ihDevmGi0owFW6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758055854; a=rsa-sha256; cv=none; b=P6iHsVEkb44sqI9d1oQ5bnOrDF+7+bKjAzctr2IOcGGAJKTCmL1a2najIwZJkeTuh0xOsl dAomhp7eMatnoGTmo6Fd3C1pTF22OXmo0OEPLs5NzM7ryIjgljm/AxUbyjm7n582CSQ1az SpASZny2RT0pg7DBr8bGRUXOG1yiS//H5tgws+heRSLE+nF19EsryIOqv7sXZG6ynn/O1o ZAQBeltqeqfEvcAs1keFyo5SkJznlA/eTJCDNbrqFwnyUmthKMAXAhfgGzxzkEQGsBQTns Qb4lVlVgJrQndRz6Rs4mpbJI2xvviWfA4Dkshmu2cDxcRe7fLLLR7j9lBFOldg== 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 4cRDZQ5bGkzwpX; Tue, 16 Sep 2025 20:50:54 +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 58GKos2w046383; Tue, 16 Sep 2025 20:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GKosdh046380; Tue, 16 Sep 2025 20:50:54 GMT (envelope-from git) Date: Tue, 16 Sep 2025 20:50:54 GMT Message-Id: <202509162050.58GKosdh046380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f1995d6fc13f - main - release: Prepare GCE cloudware images for building as non-root 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1995d6fc13fa4a36f83cea3b90f27bce2aca4d9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f1995d6fc13fa4a36f83cea3b90f27bce2aca4d9 commit f1995d6fc13fa4a36f83cea3b90f27bce2aca4d9 Author: Mark Johnston AuthorDate: 2025-09-16 16:54:11 +0000 Commit: Mark Johnston CommitDate: 2025-09-16 20:50:33 +0000 release: Prepare GCE cloudware images for building as non-root - Avoid mounting devfs just to list packages and fetch distfiles. - Add metalog entries. Reviewed by: cperciva, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52455 --- release/tools/gce.conf | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index dc56be30c7ca..a7ccfc27a75c 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,6 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf + metalog_add ./etc/resolv.conf } vm_extra_pre_umount() { @@ -94,25 +95,18 @@ EOF # ports.txz distributions to the target virtual machine disk image # and fetch the sources for the third-party software installed on # the image. - if [ ! -c "${DESTDIR}/dev/null" ]; then - DEVFSISOURS=1 - mkdir -p ${DESTDIR}/dev - mount -t devfs devfs ${DESTDIR}/dev - fi if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} - _INSTALLED_PACKAGES=$(chroot ${DESTDIR} pkg info -o -q -a) + _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a) for PACKAGE in ${_INSTALLED_PACKAGES}; do - chroot ${DESTDIR} \ - make -C /usr/ports/${PACKAGE} fetch + make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ + DISTDIR=${DESTDIR}/usr/ports/distfiles + done fi - if [ "$DEVFSISOURS" = "1" ]; then - umount_loop ${DESTDIR}/dev - fi ## XXX: Verify this is needed. I do not see this requirement ## in the docs, and it impairs the ability to boot-test a copy @@ -128,6 +122,5 @@ vm_emulation_cleanup() { if [ -n "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi - umount_loop ${DESTDIR}/dev return 0 }