git: 778bfd4e1033 - main - Chase pkg repo rename in cloudware builds

[Colin Percival]

The branch main has been updated by cperciva:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=778bfd4e1033715de6cf21e2e2454bdea2a0f1ab

commit 778bfd4e1033715de6cf21e2e2454bdea2a0f1ab
Author:     Colin Percival <cperc...@freebsd.org>
AuthorDate: 2025-08-28 18:32:55 +0000
Commit:     Colin Percival <cperc...@freebsd.org>
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