From nobody Thu Sep 04 21:54:28 2025 X-Original-To: dev-commits-src-branches@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 4cHtYJ4kyPz66ZcG; Thu, 04 Sep 2025 21:54:28 +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 4cHtYJ3p0Qz3rwp; Thu, 04 Sep 2025 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757022868; 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=CQv7evidkGoDIu4XAo7cutDz/RbryMZtGNGAlplmC3c=; b=ZNKbBX6jFNXqiYI1OMHW8phz52ShU8iq0JtTVMCwYAtFNKBLRr8j4w7x2pi+NVuKM5j28Q Mldp3J9iJPPs2icl4xFLAXrZjZUOE6pNPqtuGySGurlSDRIHXe1wtI8kK+zmEgrjNg22T5 xeX+R9WODB5nPIZRPOLh3pslypY+rbndZCWWxVTPaJmKGAgflZvcEwZEMhN26OGAinFQuV lti4gZaOjN16U13kFCJveIqt6DRf9+FE7Ov/6FFnuyVKyyQpK6jfkIF3slQ7twC1E6N8LU QuchaFC9tIp+LPXDq0WzRPz3DGSoYkz99Y6uc+TpYkRwQRKoeQpueh4Yr1x1ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757022868; 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=CQv7evidkGoDIu4XAo7cutDz/RbryMZtGNGAlplmC3c=; b=fiRXy4RD5J7scmuGtc/jAnHHAOHIJf+oPCglaKUqKfsiD51OEIMJWlBbe4eLoLag0cK2N9 s5yGECK6RM6BTfXalhbqw3UsY3ir1ki81RUm7ayhA0Av2yZ1lHdlCliyTvsA1QSwMG89CY 1tIp1MDB5CNKnRGw5pVHJF3beU5JDHJRUie7osYAkGJAfX0FdMafCFWzPxBJ/4AEDojhsY umdvFROn/DYLyE9lcargKWPljo8hiEAPgE5bl6jnZHnyWOWByb8KlXjiZ8b9Ek2SJC4/wZ Rjr2yPEnwUgk8GSkdNBZAYWBL3NV/lC0Epiqt+fPT+UAH1QxW5L5l1hUyXGa5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757022868; a=rsa-sha256; cv=none; b=sM24YYBr9Qn3ECitHZD879Kqwf+V6ib/qQN4he0zE/J1huT93Nxab0XvPZmMg6rMJGXxS1 bXSspS9gDvRaSMrQrMeiskC0TQAqhgFbqhv0iVrGgA5bLXhQaaJjvxKsXQwOH844KFjUlR u89m8PunHmBAOOIqykZob2w5rdVBu3m9EY9W6onzvlC8NXmCWZtziDoCnCsia1XIKsdL8t JFj5nHxJzH7uyO8g3/fODz2ZGttN7QF6o7ZnU7MWALxN3klpyaWbDktJjwW8kMJ/xlQ/Jr NhZAtQUGLLnWTZVuPpUpD14C2xZKhaCAJd1pSXD0fpBmPhKSVZG6o/4Wt16pYA== 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 4cHtYJ3NKgz5WD; Thu, 04 Sep 2025 21:54:28 +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 584LsSqF052193; Thu, 4 Sep 2025 21:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584LsSGm052190; Thu, 4 Sep 2025 21:54:28 GMT (envelope-from git) Date: Thu, 4 Sep 2025 21:54:28 GMT Message-Id: <202509042154.584LsSGm052190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 45d3204dec88 - stable/14 - Remove cached FreeBSD-kmods repo from cloudware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 45d3204dec88baee5d6da2890f90fe2c491e9e2a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=45d3204dec88baee5d6da2890f90fe2c491e9e2a commit 45d3204dec88baee5d6da2890f90fe2c491e9e2a Author: Colin Percival AuthorDate: 2025-09-04 21:49:46 +0000 Commit: Colin Percival 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