The branch stable/14 has been updated by cperciva:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=45d3204dec88baee5d6da2890f90fe2c491e9e2a

commit 45d3204dec88baee5d6da2890f90fe2c491e9e2a
Author:     Colin Percival <cperc...@freebsd.org>
AuthorDate: 2025-09-04 21:49:46 +0000
Commit:     Colin Percival <cperc...@freebsd.org>
CommitDate: 2025-09-04 21:49:46 +0000

    Remove cached FreeBSD-kmods repo from cloudware
    
    This is a direct commit to stable/14 but corresponds to part of
    778bfd4e1033, which both chased the renaming of repositories in
    /etc/pkg/FreeBSD.conf and added cleanup of the FreeBSD-ports-kmods
    repository database (which is just "FreeBSD-kmods" on stable/14).
    
    Fixes:  8a2ce9f9dd67 ("pkg.conf: Use kmod repositories")
---
 release/tools/azure.conf   | 1 +
 release/tools/ec2.conf     | 1 +
 release/tools/vagrant.conf | 1 +
 3 files changed, 3 insertions(+)

diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 519ab13fe432..9e698b93fa91 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -28,6 +28,7 @@ vm_extra_pre_umount() {
        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-kmods
 
        chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
 
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index bac8bb0d0e67..c0561227f72c 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -28,6 +28,7 @@ ec2_common() {
                /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-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 2735ad2974cb..2fc21911ce17 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -21,6 +21,7 @@ vagrant_common () {
        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-kmods
 
        # Vagrant instances use DHCP to get their network configuration.
        echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf

Reply via email to