From nobody Sun Feb 09 21:14:47 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 4YrgT34vrYz5n23y; Sun, 09 Feb 2025 21:14:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YrgT341NKz3YD2; Sun, 09 Feb 2025 21:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135687; 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=Cg7497KGuqZZAQrvhaSxw6Nq5YHVrcxLwyMzf+v4QS0=; b=qIcQvMbGmjUzjLFhzwAX98VMNupR6a9BzcRh3GyryDO2qs8b7e48Mm0SFQoViBZtqAAsBy jsJFM/Ez7lk+L929V+uk7xJyG1dkkSEU2QPvsHm/RUT0RM7f7/3cx+HUZI3VQM6oVGy1By hFtRiUyJRdWgxff6ad0Uv0R9NDdW3MplZ7gBmaiIuaOOeRZqWAOvJoLAK9hNZm2J5ZbE4h a4DuJHSO8bKECs6YDoE0+FHZ+yMnWV7Hjz67lHs+rlSZWoDE0jaN8te0+cbytUpgA5SIUM ytntpwAG+W8/DPyA04Oep2TNkzBo9kraokVrEfLXeAWLXGR4B/hW2E3zLNyh6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135687; 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=Cg7497KGuqZZAQrvhaSxw6Nq5YHVrcxLwyMzf+v4QS0=; b=bCx/sLdiLozIIEkJmoURFtrvAtG44sHPQnKVnzUW018UWeV0kkLYAcPwsVyYjmvSxlimxL GIYtntUm0AnYCgSPAycuuWa/c9zmkGItFEtvkKtC4BosUEryz6KQauPi1oAkYGtkyjCduX 1dgrPARDYLUv2co2xq/fJpYGeBdjMzLUdm2Ch9Uuz7tSsTu1zJIrGvtytSQvymTqfJi5M4 7oOGW69Nfl2lykZPHlw4+DQLRN9LsFu5VaDISOsaBecMjRy/t7QYvPulIEImHTcO/OGjvU ViwfJzCjSxewehoZKu+hC6+L8AxK0M+40s7hI/aSX6gQBCvOpF1t2enC0VwCEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739135687; a=rsa-sha256; cv=none; b=o4XXFtgxHQc8KjjU0P5kSJbppAOR8QXOnDO11BULu4ctJ3La4MdLYztp8DfPs3W0KSIZ7u Gu9AtpAncjgp62rtIU2pcBV5BNnzdBWbU9wnkdo8dPtkHbJyuk6IscTBvhS/Bdo3Dc2kRn GOmMvTZ/CxwIuEPoHUYb4y1hacaatFpx3vQNU3umrvsHCZyGFNen1Oi98LUtMHaCNrVQjo 8LpRK5Z2xTfnNGBDjkOHa70I9lN2o9yK2mKQMVqArJXqLaeAp7uwtDF83Rw9IwIcHxyLq+ 198BAcPwHpLOATm6IZMaU99SrCI0/8DtkLybWf/Rt8tfVNIbZHsdczVlgEMJiQ== 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 4YrgT33RKyz1CxV; Sun, 09 Feb 2025 21:14:47 +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 519LElIq045198; Sun, 9 Feb 2025 21:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519LEluT045195; Sun, 9 Feb 2025 21:14:47 GMT (envelope-from git) Date: Sun, 9 Feb 2025 21:14:47 GMT Message-Id: <202502092114.519LEluT045195@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: eebfb83805c0 - stable/14 - release: Chase location of pkg repo databases 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: eebfb83805c0f9f11ded223e5742a58ab6a5a1d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eebfb83805c0f9f11ded223e5742a58ab6a5a1d6 commit eebfb83805c0f9f11ded223e5742a58ab6a5a1d6 Author: Colin Percival AuthorDate: 2025-02-04 00:10:47 +0000 Commit: Colin Percival CommitDate: 2025-02-09 21:14:34 +0000 release: Chase location of pkg repo databases pkg used to store copies of upstream repository databases in /var/db/pkg/repo-*.sqlite. About a year ago this was moved to /var/db/pkg/repos/*/, resulting in FreeBSD cloud images no longer having those (unhelpful since they'll be long out of date before the cloud images are launched) databases removed. Remove the correct location, and hope that future pkg updates don't break the base system again. Sponsored by: Amazon (cherry picked from commit 078e8b34b13d6d0663661542eeac9007806fccdc) --- release/tools/azure.conf | 2 +- release/tools/ec2.conf | 2 +- release/tools/vagrant.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 9da2b19de694..519ab13fe432 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -27,7 +27,7 @@ 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 ${DESTDIR}/var/db/pkg/repo-*.sqlite + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD chroot ${DESTDIR} ${EMULATOR} pw usermod root -h - diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 963c6ff4957b..1fe44118fd3e 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -27,7 +27,7 @@ ec2_common() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg delete -f -y pkg umount ${DESTDIR}/dev - rm ${DESTDIR}/var/db/pkg/repo-*.sqlite + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD # 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 5a4aa7d3ba79..2735ad2974cb 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -20,7 +20,7 @@ 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 ${DESTDIR}/var/db/pkg/repo-*.sqlite + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD # Vagrant instances use DHCP to get their network configuration. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf