From nobody Mon Jun 23 07:42:32 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 4bQg603j1Bz5ywf8; Mon, 23 Jun 2025 07:42:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQg601qM8z49d2; Mon, 23 Jun 2025 07:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664552; 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=DTpcUlSYPm75Oi5JxUMtxTjMPIqFSlJ8xKrxfqj1Buk=; b=jxNZ7jlypl/o0Hgj6iwJNH3zcgUYmp1UN3hxeEjyeHX+uNm9u3RVVcmUE/ISTNc0y+w+VL 3grz+TOTobX2RvsVjOGwAX176SBPhSritpovD7n1ZOooAkMm3k5LFm9l3k7Oh1/W3oTLBH R2+BxQu+qGQRLuufzCSZnWeqZsAe3LrugYG4qyyzGZ2t5tq6kze9HH69Il6bgvbWIhmzhu PiUP4lWGt7B7Om5vjtz5SCUCDsVuPdMVIi+qiAvzaxBJNjZO9CYw+OEn4RNLWNfimISE9A 5nxYZUCaRULYQDNMZnqstXjMeLahQabkurzYuMbHndSzKlVlHsxm2UBOcSPKBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664552; 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=DTpcUlSYPm75Oi5JxUMtxTjMPIqFSlJ8xKrxfqj1Buk=; b=UsVdSjmxa5bSpwuw1RelXQ7uYq/WMZLDc2262hDGLclBpwEvpm2Bgj4UaHrEmjqj5uq2T6 WHn8RhCRzESuyUKvKHEA2z3Gnt3W17MdthUzb0Mmc68tF3vpXzRQNAWFadwq8nory0c8ii /DO1S64m/c/vgdRR3CqQUyVHM/sl/0DRAMNJ/NpTEVtwmCoQmFbniW7wN/lw6qZMMlxHoc 6eFlVUjs1db+6dIU2MhjxhlkLI8177t1ri9lrvpoBcIs5d+ZchlBsRC6NJK79HH86TZSpp hqff2D3/SiDC6e6ZI/GmcsT3yAv5F61Zgghv5zPFhrSuwmgQsiqzJlfsiNtPsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750664552; a=rsa-sha256; cv=none; b=ttLlBELOeeeFvshyZ87wQDMxnCE9j+yxencmREtIPPklkzIEDErG+/5OEpzrtvss9h++9d sZXG/Bt8wK0DmMfUcjCDCRNt74iHio2tS3kXQtg4AIlgV5upwkgNzEpaSSQtFHqlpE/yGn ZvCCkPcL4EN7vJCmA/9BejYuSDQbtoajEL3/+b17ArrukeMiNbk+Kvv86cR6QrjhSX7uC6 rKN6KLCVfzq7Xb9x2uMpcPDu7afRE60IcyFBJ/OJ7I7qKQJf4AcrQJ9uBt2sXDiCXzD+2L amS3Vmqy/1EeU1ntLM4Y+dZo7tN//qNO8PWg/okASQcoC6eWEsyYRXc8S6imEA== 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 4bQg601CTvztYn; Mon, 23 Jun 2025 07:42:32 +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 55N7gWpj066404; Mon, 23 Jun 2025 07:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N7gW7V066401; Mon, 23 Jun 2025 07:42:32 GMT (envelope-from git) Date: Mon, 23 Jun 2025 07:42:32 GMT Message-Id: <202506230742.55N7gW7V066401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: eb9f57c2458b - stable/14 - pkg.conf: add valid configurations for kmods for all branches 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eb9f57c2458bbae5be4ab52590bae9b2ac65026c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=eb9f57c2458bbae5be4ab52590bae9b2ac65026c commit eb9f57c2458bbae5be4ab52590bae9b2ac65026c Author: Baptiste Daroussin AuthorDate: 2025-06-03 14:20:20 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-23 07:42:26 +0000 pkg.conf: add valid configurations for kmods for all branches MFC After: 1 week Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D50668 (cherry picked from commit db6f6cc583bde6c21618ab4a4ab926f9d57b1641) --- usr.sbin/pkg/FreeBSD.conf.latest | 2 +- usr.sbin/pkg/FreeBSD.conf.quarterly | 2 +- usr.sbin/pkg/FreeBSD.conf.quarterly-release | 23 +++++++++++++++++++++++ usr.sbin/pkg/Makefile | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index 2175a3387437..8c68118c4938 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -15,7 +15,7 @@ FreeBSD: { enabled: yes } FreeBSD-kmods: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest_${VERSION_MINOR}", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index bd0ee13b9b43..884226fc02d1 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -15,7 +15,7 @@ FreeBSD: { enabled: yes } FreeBSD-kmods: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release new file mode 100644 index 000000000000..bd0ee13b9b43 --- /dev/null +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release @@ -0,0 +1,23 @@ +# +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: +# +# mkdir -p /usr/local/etc/pkg/repos +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf +# + +FreeBSD: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index b44905ee4976..27f77d3dbb23 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -7,7 +7,7 @@ BRANCH?= ${_BRANCH} PKGCONFBRANCH?= latest .else . if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} -PKGCONFBRANCH?= quarterly +PKGCONFBRANCH?= quarterly-release . else . if ${MACHINE} != "amd64" && ${MACHINE} != "i386" && ${MACHINE} != "arm64" PKGCONFBRANCH?= quarterly