From nobody Tue Dec 10 08:17:05 2024 X-Original-To: dev-commits-ports-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 4Y6s5t1NSZz5fn5b; Tue, 10 Dec 2024 08:17:06 +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 4Y6s5s6Kcwz40hj; Tue, 10 Dec 2024 08:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733818625; 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=h99gKjOclGxPX1BOaU4pXEU8oAge7gpVQU3H+o1MQbA=; b=pd3HD9XlDRePuB7tskhUnft+rDnGSRsSmUMjrAp5Yni9NNfZl2KUfKj7no135tDpOB6RCd JO+EsFuVMmHdw9n366NAg20wL9QfapZwVT//suYGoP08bhBaB11g8Wxeu/95DgCNYvzXoE gtgcZXcIlNsd/Xmgd2+dF4jtLeZ+wv6OUzbG+LZA7F/x+9J7/GXcQMOJYI9+LDkQGw4wCR vMXlLiMGIRgPGkmdORM+AxubmUGiMNw76QQ2kc9YAPAKDgQmS2xaJsSI58ChDEga/PulVY 56H7xxZMIaoctfgcQ1uFHflWpb5xxZxWdaZzcfOIE3kFhCEd4IrhaGuisWFTjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733818625; 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=h99gKjOclGxPX1BOaU4pXEU8oAge7gpVQU3H+o1MQbA=; b=C4nix4gevCDjBb+7crdyry1fdJ+FDeKmVd+Hdt6P9Vjmbo/rs02+P8ODjoNWFm4oERiNk6 hMnYuVlK1OyrbPiCRbMmsrWQ5Arx/UU+jwPeVIcWZNK5Pg2LeZu3A+YTvLtkLpkqE0284A y/I9uFIgSDdhOHU9MWceZhC9BJUvRiTrtX/BpdvIgaaNfKqGV25P5bgqA3M8xnoRat4qLI KuN8YvZwHc2AWUAqyLKOdPg2fI7bP08jX9no29BtKkMR0olrLAJcRYnPeNcGJRak+dHKZK jfb45M86VhjcLBRs5ydZK3vIm+b1N1fNph6VC5jikuncylCXqnOCB897ohI7cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733818625; a=rsa-sha256; cv=none; b=FPL7Swzo/54otNgIs5eLOS/Adi+lya+lbGR1F0ZPpTQtXR/q/rzR/wKBbUpqoe83gGSMfE Ahl8cFkIsGMwHAtTQiZL+PRZ8aYZ+59hlHgV//w9fSqIubzSAhEExw1767+DHtE2oSjiea dXPhAhu+FlEsXe7hiLpHVu7XRVKv6jnQrStptaDhdNgchyAJ5zPDKNtjWeFTpb/C90H38t t5j9sXqQ1+AKGWfPeVXGVqB9J2ySx4hG4K5KyRcvewAmfdP296ReDy66A/od3+WFyT0KnZ q9UiPHfTjBNr84Hl09dGOZTGJ/TzY5HIaRSqVogtg2XuwZ4T3s4RWc2GDJs+8w== 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 4Y6s5s5x6hzFgn; Tue, 10 Dec 2024 08:17: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 4BA8H5u5007355; Tue, 10 Dec 2024 08:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA8H5CD007352; Tue, 10 Dec 2024 08:17:05 GMT (envelope-from git) Date: Tue, 10 Dec 2024 08:17:05 GMT Message-Id: <202412100817.4BA8H5CD007352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a5fc087131e6 - main - kmod: append osversion to the portversion List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5fc087131e66513d1c74f8427c924afff580a15 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5fc087131e66513d1c74f8427c924afff580a15 commit a5fc087131e66513d1c74f8427c924afff580a15 Author: Baptiste Daroussin AuthorDate: 2024-12-09 08:57:35 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-10 08:17:02 +0000 kmod: append osversion to the portversion The version is now kmodpackagename-._, This is necessary to make sure that the same packages built on a newer version of FreeBSD on a given branch is considered as an upgrade of the default provided one. In the current model of support, all packages are built on the lowest supported version of a given branch, which means right now all packages are built on 14.1, this results as since 14.2 has been released and up to the time 14.1 is EOLed we do not provide working binary packages for kernel modules and related for 14.2. With this we will be able to provide a dedicated repo built against 14.2 that will be usable by users and pkg upgrade will simply update to the right version. https://reviews.freebsd.org/D47997 --- Mk/Uses/kmod.mk | 2 ++ Mk/bsd.port.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/kmod.mk b/Mk/Uses/kmod.mk index a28077e67697..36bc49462fdf 100644 --- a/Mk/Uses/kmod.mk +++ b/Mk/Uses/kmod.mk @@ -25,6 +25,8 @@ IGNORE= requires kernel source files in SRC_BASE=${SRC_BASE} CATEGORIES+= kld +_OS_SUFX?= .${OSVERSION} + PIE_UNSAFE= kernel modules are not executable SSP_UNSAFE= kernel module supports SSP natively diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 360fff6fc4cd..01dc08c265f5 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1386,7 +1386,7 @@ PORTEPOCH?= 0 _SUF2= ,${PORTEPOCH} . endif -PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_OS_SUFX}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL}