From nobody Sun Feb 09 21:19:05 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 4YrgZ16cchz5n2SL; Sun, 09 Feb 2025 21:19:05 +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 4YrgZ161Vmz3b6b; Sun, 09 Feb 2025 21:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135945; 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=9axqbFO3tEY6ib7Z7Tqzq/qOq61yov3+6aGiA7I1WoQ=; b=Tjv79Z8jFW8Y5vdiPUTSPUqOG4c04mS93Nu/WElESyQ5N3UM2zVLkFwno1UlwI4ouNhhX7 qj3HOGOsZqzRqgzV+65W+te/QzJY6RNuGK+14GiH1Irj+UN2NJlBMLDcUj4K8k7ZkPbh6g UQe8YtbLKPayINr2tPOdyzcBv8Obo0nnSVCwxUCYXe4NFMPP2ZdhcGBuEBy//SoLQpDuF0 IpxB0EEiPYefld7QnquapY0rpOsGgq5mv0Xj/15G8+XaO0vk7HISaO/2G3eBkubzsK2qVn ghSIWaizSCF9HPih4iRMCu0ecDMu9b7zcAhzu2pVxnWVTstfVVyXGp5F0mFlgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739135945; 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=9axqbFO3tEY6ib7Z7Tqzq/qOq61yov3+6aGiA7I1WoQ=; b=ro8QSzN+UbHDFjmVYfzUc58gmnmwXTlfCBqiZJnh33QPN+Djrs99+YnesH9i5D7Vb7HqVI z4ypTlQF6L0P40VFPZ6rhQ2Q4gwryXPrmFMh+xSRQSmTUH8ZsKFssV9V5aLsYtLfOS5p31 4xytYVKM2OdYlpBXgac+Owgf9X1EGzlrAZtfei3K1GbmeDm/yf53hL39Uhb3Fp3ISxBoQL G1ZxhF/OPhsOOF9Sv/mWtib+LMClEDQhC7JHBAnPtdGi2s8L+ys6ReF6h0kt7iHoHN6uz1 s9bibKtBQUPnB0eqp2urbFOQsf7ciaRRXlStnEOnoMv6qRDdyXE5bdMSu10+Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739135945; a=rsa-sha256; cv=none; b=fIgDQd/7uPt0EvxnhUN46+5P/eoAv0UmelmJoKfNSNcltacdEtXAfj2xb+qoSvL/hUfeEC eJmHGLM5MnaFCoSf5Ju8nBa3PRpbKwlyeHaHGrnZFTi9DsAsm/GzSKreD/hzeA26ckVidR OvKOnW0qf5+vvc4rm05gs8FGAxboQ1PC0znYfnA1o3MUjaow8nu1RVC0FxsjvYi4dhnMtM RxOxmKlnm5bgFcqIkzm5UP7TK0T8weOCKWVvbWjtcx2CUxyTQilHCA6NJpTEsDZheU8Dri e2J8JgrgCE8eTxAHF18CmiakdfrcllZ2/nEvS/B7eh6nmpDyZzLcFY8iSwhJLw== 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 4YrgZ15RTGz1CgM; Sun, 09 Feb 2025 21:19:05 +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 519LJ5t9046730; Sun, 9 Feb 2025 21:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519LJ5Wj046727; Sun, 9 Feb 2025 21:19:05 GMT (envelope-from git) Date: Sun, 9 Feb 2025 21:19:05 GMT Message-Id: <202502092119.519LJ5Wj046727@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: ef6b3c58883d - releng/13.5 - 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ef6b3c58883d5746084d0a5f7013d9851f232f73 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ef6b3c58883d5746084d0a5f7013d9851f232f73 commit ef6b3c58883d5746084d0a5f7013d9851f232f73 Author: Colin Percival AuthorDate: 2025-02-04 00:10:47 +0000 Commit: Colin Percival CommitDate: 2025-02-09 21:18:40 +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 Approved by: re (cperciva) (cherry picked from commit 078e8b34b13d6d0663661542eeac9007806fccdc) (cherry picked from commit 8984d070d6669669754ba1f66c7acd6d7dca1d2a) --- 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