From nobody Tue Feb 4 00:13:55 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 4Yn3kW4722z5mk6Y; Tue, 04 Feb 2025 00:13:55 +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 4Yn3kW3XyQz42sh; Tue, 04 Feb 2025 00:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628035; 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=WxqbVDl0kOL7YC0CqZPzVpKiwspwghsQGVN8rw2PqE4=; b=wVt2gK6HwBGUpN/3j6muB/j2Exu5vrRLZTaqw5cgp7vcjST2uMjgyzbiMohFMDWEOcvWtT jpbfY6qo6dYD8Nk+l+T1z/M+rKIqxjN48LeYgOzuKnSY2SYb3T6ijjNWdAakTq37dm57dB wwGZlfyCu6I/PzWYqwlUE8i4nxw8EEi4NSoWDvzsIDfZ7aR3l82AkhdAbZNIiHP7slVTlh O/zx6ldk/RSyhP25cH16n9sLEAAgIlwz6lEsqmKsu3rJoJr7pdzImbPPV7a8gW+Yhlugi0 wFXpfbV3ASW7xlx24Eqd8Y/RewDMyTnFSvkFDO9IPLSOxmNJhD/Goobl8ztvMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628035; 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=WxqbVDl0kOL7YC0CqZPzVpKiwspwghsQGVN8rw2PqE4=; b=S9g64DHMLpLl4SCyOUBZK7tCjhu+BLJF0bQXfAefNC8r5cDVvA1L4Nqod0y2bZ/YLa+M9f BeTaZGXqtsCnTUTnoNdQHGO5x4UaXSW/kqiAfAsU4q75iXLvBADsbtRT9VBu2g2+VMBI7H Ig9nImRKuzXeGVVlARi4dmO3Shz4IaOvxUL6RVpz9R1RsJ6ojD5H96s74w7Clq642OkQhD 0tbuV+qm5GpTQgt/pk6odeAp7+EgbdfrqgatccIN0YH4VybMDovCRuULI8krc6jWA6zUFm 8sVqzkL74G/+odeUGeqKrRoYLxq7xbZvN0vw2YwDVgc1Epkrcm1fb8e6r7gRew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738628035; a=rsa-sha256; cv=none; b=h/HQlhX+nzD7U98kkzevu7iKwA5J/M4U1cvJsihDqiMIMlgdB1vXLF348dayXSr2NzaIbe IiOtufCpg+6zqBBhN8yCJu0dXBLMEfJp4OQ2+kDqSJFz7bGuOJbJF9EE3L0UoDVGPV4w70 6ZqekEgTP/lx66dZXaUXTh4nNh8Es61kJZ/SnQY6fe1a4Xmc4zbEDeELRKXR4n3WgSA6Vh 6KExOC+5XZ2HKziqlEii7eBPT/86RHUHNdtTzxmAgL+1QElvQD9+43NmBZk1DpRdHx5py1 zX56JWTOTWa4lgyuyPpE9ii6jD3GMTpk1FWkwgPFG8tKlxsoq9RPQmOChNC37A== 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 4Yn3kW32wdzymh; Tue, 04 Feb 2025 00:13:55 +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 5140DtH0077203; Tue, 4 Feb 2025 00:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140DtEn077200; Tue, 4 Feb 2025 00:13:55 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:13:55 GMT Message-Id: <202502040013.5140DtEn077200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 078e8b34b13d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 078e8b34b13d6d0663661542eeac9007806fccdc Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=078e8b34b13d6d0663661542eeac9007806fccdc commit 078e8b34b13d6d0663661542eeac9007806fccdc Author: Colin Percival AuthorDate: 2025-02-04 00:10:47 +0000 Commit: Colin Percival CommitDate: 2025-02-04 00:10:47 +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 --- 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 ea61c2fa6db9..b5a91d47decf 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 83a72b8e8aac..c212af7d012e 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