From nobody Tue Sep 30 15:23:35 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 4cbhfJ1Ytvz69Dtf; Tue, 30 Sep 2025 15:23:36 +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 4cbhfJ0lxBz3LVs; Tue, 30 Sep 2025 15:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245816; 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=/Rt9PGcEMUkBXYdyaBCqBHQ72+9eJY9dXJmOrfZSNyk=; b=XdU0OoXx6PqziW4Mc1Wq30G/c+pWnVZWQXjprF8nV+1E6kQLbi9WI8DDFSjYWrRMBdd3iM KyhihyWAORI2z0PgQdeaHY2eOQVU2jrasFvBW62fXhhCMXcDbdjd7OZH3L6YXDYPfKx97F vmGIksXrLFmLBHbq5oi+5XLJEeq4aYjryBi/eI3aanXcfIYWbLicQb6XPhZY//Gjs9klJ1 EyYo9DGHoooeC+WlCRxmmunJfeB3vlzPZ71clv8RGKdJvJCGyRk5/jDOakAnuHYMXb0b4i I4Kk84vrJ82IXbNgMQTerDFOM3V1mpHRAIzJT0e4EndI9gtafMlh+b0OVYFJTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245816; 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=/Rt9PGcEMUkBXYdyaBCqBHQ72+9eJY9dXJmOrfZSNyk=; b=g0XHW557YgvUvn6bai273A72D9UI/PQtlgDqDWhZefoZCGVA3u+DyOQY8Jsrv8SsCA+QC2 qIa4uJpOlwXpkCc8dd6nGd8FRFvibnoRMzAJeIC+I1/2pIQg2d3k9XKpS6jwBc9qsNYj6R emPlwOLrR2Zp/mZe08T7F90l2tZJSBq+1DNdbZu8ev5VybmnQkW0F8Ytv3JfUwhHqYSO+W hBleUKMFXPVr9andrNVYUdF48f9K5pOBg8Oreuzo9gJ5ARkayY0pTb8A26lL8DG4/JqUFC FZ6qPle0yeTCdgfoAL0mh4Y6AVKYtuCDL8OAmHsW8WM3WiSH2QCafoSnHE8VtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759245816; a=rsa-sha256; cv=none; b=hWDA4sCqO0qIDt+GxFrFdC/5RYfAdvLNam4fHZ+ysdm1IeDo6JnqOagqCVRjC0D9tov54N hP4ydXOICuXOrTV27KoSh4Pr8YOQOpX063/rDL4ehVBRZdyApP/FNOviGdjlpU5twVjnTI DsBrunVdQt1HgIjJxxjEoyS2ejUNookzNhHVAz0hj9Cl9fxW8j+j3RmD0NE4RPs4B7fn8v TN6newW5E/ibrE4A+h0Yt9GUNhFjwp8OyY1kTGpsacQvx50+ik7f6YCqPFx+K7BPmXGxBD DKd0VCuz4sW3umryyKJTF3KG+ZljwlMaqDxgcbWWJWtQDvKSRblHiwLpBMnikA== 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 4cbhfJ06QFzjf7; Tue, 30 Sep 2025 15:23:36 +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 58UFNZCB045625; Tue, 30 Sep 2025 15:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFNZNr045622; Tue, 30 Sep 2025 15:23:35 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:23:35 GMT Message-Id: <202509301523.58UFNZNr045622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1deb72ac2db6 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1deb72ac2db60c983310edae33f1d33eaf3ac8e9 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1deb72ac2db60c983310edae33f1d33eaf3ac8e9 commit 1deb72ac2db60c983310edae33f1d33eaf3ac8e9 Author: Mark Johnston AuthorDate: 2025-09-16 16:54:11 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 09:43:08 +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 (cherry picked from commit f1995d6fc13fa4a36f83cea3b90f27bce2aca4d9) --- 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 382a839786f3..e1c208e69fe5 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 @@ -130,6 +124,5 @@ vm_emulation_cleanup() { if [ -n "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi - umount_loop ${DESTDIR}/dev return 0 }