From nobody Thu Aug 28 18:36:23 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 4cCVTz5tf3z66RV1; Thu, 28 Aug 2025 18:36:23 +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 4cCVTz5Pfgz3YZR; Thu, 28 Aug 2025 18:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756406183; 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=2aGHD05GCPzi2Sd4WM/l5Vt/sFR8E7VEiQg9ICrbwoY=; b=VXfrJM13g2UOSxlpXlRpERuQ2UnGa51+QvTQUCiIv6TCC1xbCUuq6YzlcK1yEoc1VFNsxe 3UJaGr/QUoFveQrpIhTR4tniqC8IFM4GWD+AzQ5fuC5I9YYVsy0fSDXtsENZgbEDhk8Phy Iv7fouvuuVdgFsgstIA10YzKTllHjhCqTMASfOVOhOatcopA3JjODRFxBAGs3CW7Sct27L uvZnarvKAXbmR3mOucq2QIT+pMHKd5SMqqjwa/tKECuBbaWnDm2o/jZJOdnaACBfwps63b b1CfDyIwbLBIgFyO+ye0sK+bCevY8E0PPry+er4rwd/aHYKypBM4arAKhyXSdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756406183; 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=2aGHD05GCPzi2Sd4WM/l5Vt/sFR8E7VEiQg9ICrbwoY=; b=UI1wdf+qwfC6pi5PbimNGC0IJtPtFdiuGmTIrUoUF+X2muMvEB+JpxGPikQZ/vZvczqFKD 9lFcT6OevG2umpofKqhgwiD3v81oRZJKwHkGq+JYJ32vDt6jphOMIR0nmRbG4IjHOUsO7F z4lOJnehQw+Nm1qq5R6sRRaE0W9jPVhFDwmO8XUKt9sctBJIgOAalDj7/GbR2Fu7ui14PD BcqGN2HWfVplzIqgs+bFIgNGSBz3k/ktb29Gyk/I/19j5CMqh+oU3xorImbsrjKFqOnVzS e8kOchg2Y0ta7v5B2QipEgkEyc+HRGCPm1DAoAPO+wv1L9Io2ICF4BY7Z1LWbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756406183; a=rsa-sha256; cv=none; b=olWyLjGg49ehwktR1PKtELg8benOd6vJ3FJStXOU33vQr/1C2IdOpJudG5g/DyAig6wFKx deJEuvleuYHAT96rmpYqU4i4x8+xNOKh5mevYMddgfkntZwh25oC19oqQQb/7FNFlNWmkA EXBn020EQVDJpnDSB6GDcGQXhugeX6kMzmeiWzTQDqIryx4G8J4zj3hOvU1qSPiUO2K3pN MwNAS2M/9Yod6C4xAJPLPe84q+AmaDMpVo9Ii9So0q+ZD2F5OTVmkExVNXX3IcrX7clJrU ytnOu3DcXD/JgXhq/8IkReU8Lk3OxJVW9TmoMFESs+ohRbxb0xmWfLo+ouOXvw== 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 4cCVTz4y6Gz1KTt; Thu, 28 Aug 2025 18:36:23 +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 57SIaNlW070605; Thu, 28 Aug 2025 18:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SIaNvg070602; Thu, 28 Aug 2025 18:36:23 GMT (envelope-from git) Date: Thu, 28 Aug 2025 18:36:23 GMT Message-Id: <202508281836.57SIaNvg070602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 778bfd4e1033 - main - Chase pkg repo rename in cloudware builds 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 778bfd4e1033715de6cf21e2e2454bdea2a0f1ab Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=778bfd4e1033715de6cf21e2e2454bdea2a0f1ab commit 778bfd4e1033715de6cf21e2e2454bdea2a0f1ab Author: Colin Percival AuthorDate: 2025-08-28 18:32:55 +0000 Commit: Colin Percival CommitDate: 2025-08-28 18:36:15 +0000 Chase pkg repo rename in cloudware builds We ship cloudware images without a downloaded copy of the pkg repo database, since it will typically be wildly out of date by the time cloudware releases get launched. These paths changed due to the "FreeBSD" -> "FreeBSD-ports" renaming in /etc/pkg/FreeBSD.conf. While I'm here, nuke the FreeBSD-ports-kmods repo database too; I forgot to add that when we added that to /etc/pkg/FreeBSD.conf. Fixes: c83705a5756e ("Rename FreeBSD* pkg repos to FreeBSD-ports*") --- release/tools/azure.conf | 3 ++- release/tools/ec2.conf | 3 ++- release/tools/vagrant.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 519ab13fe432..a633e6e508d4 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -27,7 +27,8 @@ vm_extra_pre_umount() { # them from the image allows it to boot faster. chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg delete -f -y pkg - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods chroot ${DESTDIR} ${EMULATOR} pw usermod root -h - diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index ef7a603efea9..31f40962b19d 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -27,7 +27,8 @@ ec2_common() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg delete -f -y pkg umount ${DESTDIR}/dev - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods # Turn off IPv6 Duplicate Address Detection; the EC2 networking # configuration makes it unnecessary. diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index c212af7d012e..506174d0ea16 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -20,7 +20,8 @@ vagrant_common () { # them from the image allows it to boot faster. env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods # Vagrant instances use DHCP to get their network configuration. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf