From nobody Tue Jun 3 15:48:19 2025 X-Original-To: dev-commits-src-main@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 4bBZql67Pmz5xnZQ; Tue, 03 Jun 2025 15:48:19 +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 4bBZql2JYJz4GZf; Tue, 03 Jun 2025 15:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748965699; 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=p1RXiEbiO2wv1KdXERC079BYdWEVOHDlD6ywq+aM5y8=; b=NuCyTOUC83r12VvO1iA59v/2BVbPRVRkFsftra40EMrW3mqsy6DcUIqjsz9BvvBNwXMJY0 srHR0EVcQjetmWXuuGqXWoeEMFyLwTgvS9FHjGutg1f69mSgP7SFZWZY1lbP6AKkf8hdcT biq+qN5XpElnZKMk98JOZsXUH3cTj2DSyN11Qo7R/gBb3L6oaW1JKXPpwLwMmZSQKg1fX9 ozWRJKY7/zPmlwKECY+AMWuz/RL3cRoILfaksL3ZXSqG88rVVR/VnkyFBDEBSQyW0fPaho 5RE3SAjdHXe4xIG5n8rTrpyDl4A/ApPC72VcQ+58QmPUMRk8sNx5UvbRGJRNFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748965699; 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=p1RXiEbiO2wv1KdXERC079BYdWEVOHDlD6ywq+aM5y8=; b=jlpVtmsoMqSmTFBwp075wtsRrlZ5w0URlK165Q7YMKRAVIP4sYPMUQzfxjLV7DcYr7q0At xUqnbNTYO9qnykRv7HtIh4ozxkOWeExChpyA0pc9ThQUyEO0GP0rD2XQN6YIJBpqqe9xaR M68eRK7tFh/OE1FHTcJ6JQ5J34Da16z6rwAetQQY9UXfN6tA8m6gHfW2HPk8DXhZ5PKSIS aMOTVc/IM1iCfofJP7k+uKK66ZGDTu0O2H/kvjInsbxKBqtk2+j0BblygxFspcySP7CfLg hqDv8WFJSAN5f5AvNlGPR8WH4uGay3gTKW1DvJfxE+Y11u9ENKaQPQ7lTx+MzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748965699; a=rsa-sha256; cv=none; b=NIuFSYSKCmtLf95hDuDnRxsTdIGZGrd5UyNCJgP+aqJlzwiudSayjStbm80LMN/FNWEjQh kcDL+FcT02nAPDjxY72XNiO2Da3K9GqyLX4kcn+uTNiyVPo95SWl9hU03L7pj11jcsIGpc zf9QbMTpQ+SKqt8octP8sAvtFUjSCY5uJgq0zC6iZl5fndLgKGlXZFlnxasVNugdAcoFg9 Xo8G8JGbj7DhIGAuJbccGGceuEnS0Mb0jbEhU69XSW6yORHcd5G8GTSxQjJ7vUObl28O8l yRVXQTiCacoLJacjvHHUT4WU/3IqH3ZrikK3FQydg8ZBJOiNhZZcfByaxEheOw== 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 4bBZql1sLHzlbn; Tue, 03 Jun 2025 15:48:19 +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 553FmJYH081619; Tue, 3 Jun 2025 15:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553FmJOs081616; Tue, 3 Jun 2025 15:48:19 GMT (envelope-from git) Date: Tue, 3 Jun 2025 15:48:19 GMT Message-Id: <202506031548.553FmJOs081616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: db6f6cc583bd - main - pkg.conf: add valid configurations for kmods for all branches List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: db6f6cc583bde6c21618ab4a4ab926f9d57b1641 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=db6f6cc583bde6c21618ab4a4ab926f9d57b1641 commit db6f6cc583bde6c21618ab4a4ab926f9d57b1641 Author: Baptiste Daroussin AuthorDate: 2025-06-03 14:20:20 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-03 15:48:15 +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 --- 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 2fa0dbb053ad..0420065bb7eb 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -6,7 +6,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