From nobody Sun Feb 09 21:16:41 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 4YrgWF1hN9z5n2Zd; Sun, 09 Feb 2025 21:16:41 +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 4YrgWF1BzHz3Z4R; Sun, 09 Feb 2025 21:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135801; 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=hxurP76PXqgP/WXa71bO9jUfAXE0aXdQXGTP+uG7rAw=; b=C1z0WamTno6+pj0CAWS9tjm1z3slzkwaQ3H0qHksDNeOjHYUSJz7HuCSbSztoDkNQDubVu CV9czvCfn14jRcPt1xHfttAkQAWoWi7+prjeqEwGdYb1xlTmTTtC7p6oYGv0BNJTxcEF7y HPFlvlPldwwGqHM0mFALj5BCr2RDMYkiLu6kzu9KcE1paPZIEQpSngUoM5vNObB0HWqKDo OAZzlA4UG/O2KXSfvFCKL9LJlYkDryW5JtzoJvM6Bfx3/zoGhfb9bdS3DdxoJ6GQCSVLr7 BTU68SslbCLNFqcp45KNVRGsTSOIFt4aoWTVCx7m2g04sUiZ7F5q/iKnyO13pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135801; 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=hxurP76PXqgP/WXa71bO9jUfAXE0aXdQXGTP+uG7rAw=; b=Iml+0UYxFnDEepaTVLllo3po5CLk9CpMeCqEY/dehs8WPL6kYm6Z/Yy0K/dbwagj+q1H5G g/vrXHRLiCpfnLHHZavrEi9WI9y6JuRd36JmVafVBVdtStdOEMhKRgJhQ5yGkHnrdGElgg 8ebjpbjevwArnE4MZPL87W7Ubjhl4lsaMqELg3eyzXYh6DwENrDbXseejJcpchCIHRY9GH UJ280uN8El9AmkITBGkSBytCGasYMfzhjtaW1W8E+Fg3MWw1uN6kt+LeTNn3yDLXdkHzVf Vn6qPDX3lzV/3cFR59rN/xrKJM1QOKw9OQY3CgQtVBb/ugXOv6eK97g+XvVIyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739135801; a=rsa-sha256; cv=none; b=AZW46F1S2GRQyR62W30z8esZWkcP4V2HxHdZKeV03JO47AGRgmZZvBlWV8EDO4UOJpKC+l 8OXAbQ0aUVt9TX7Nyb/XOudwdQpuyyl+EbRs77H0QLMRq094x3k52E8wAERlOhfS75nKja Di+CnqBsc938SKy4fPlpME8snZ+BZL6+4pTU+Avz9FEdJYDF/odogg303tCgRp3TgXQ6JC GvWOfjdlNWjRNqimwJEJPWvtkDvgjtzwEKPFsUE32ocIwzeBUnxl4sSHU15ccd12filaI9 iGbS+jqkm+1exsH9obZ5Lr6lUvjUoXZ2tpvlpg/4VWHMc/rBV82rOlK9rfBN+w== 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 4YrgWF0h12z1CqH; Sun, 09 Feb 2025 21:16:41 +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 519LGf9l045889; Sun, 9 Feb 2025 21:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519LGfR1045886; Sun, 9 Feb 2025 21:16:41 GMT (envelope-from git) Date: Sun, 9 Feb 2025 21:16:41 GMT Message-Id: <202502092116.519LGfR1045886@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: 8984d070d666 - stable/13 - release: Chase location of pkg repo databases 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8984d070d6669669754ba1f66c7acd6d7dca1d2a Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8984d070d6669669754ba1f66c7acd6d7dca1d2a commit 8984d070d6669669754ba1f66c7acd6d7dca1d2a Author: Colin Percival AuthorDate: 2025-02-04 00:10:47 +0000 Commit: Colin Percival CommitDate: 2025-02-09 21:16:25 +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/ec2.conf | 2 +- release/tools/vagrant.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 86706e21513c..2776331d9905 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -45,7 +45,7 @@ vm_extra_pre_umount() { 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 # The size of the EC2 root disk can be configured at instance launch # time; expand our filesystem to fill the disk. 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