From nobody Tue Dec 10 10:52:00 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 4Y6wXh3wNzz5fy51; Tue, 10 Dec 2024 10:52:04 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6wXh2ZL4z4HPp; Tue, 10 Dec 2024 10:52:04 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733827924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AOILdGy99udMu8iFks50DEwo57AC6ypBTvEjhfC7sBU=; b=cAvLrsd7D6Ux0JPMuNZFOFCzqbSYMnbNswdmjKcgFOqGl9qxXMpZYeLMeOxsdUybnU9JlR aDrMlkMnBuTGuV4NTM6xXS+/WGPtCjuUlvFxb0TH52dlE8zonAtzuTXtpgcGjE86IO7s82 lup4zPr3kCwVEkmoatdj2zdH7FP3dJ5eYOyTrRgVa/VRnHLySQFMq8SrvZ2xAsLCZ20IJ5 Pc6o7DtnFFD7HFvIb3jN+gMxKT1sO1Db641VLeIbDPI99Zynp4IoSIpEUwiRrqoplo9fJ0 9sJX/nnHq7sK52WBZKwchEAhGahR2McnWUaY1x35P8DULtQttc0RWVw2YPeACQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733827924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AOILdGy99udMu8iFks50DEwo57AC6ypBTvEjhfC7sBU=; b=rOb1CTDHDGTmhC8K44mo4t96gYGRp4XGNw/8iUu/wmFxML7lgthb2kys66/w/BbqqMk++7 OeMOlMw1Fd3VKMPcSVIZkMJh3tOummQsSH5lJ5IT+LpvYChinhUDCEJHp2eALKaTcTJr4N Z4JkfnQoU+I5OJ2HID8VjXVtPNmDrt1ntEa61oGdLAKc8n9Sz3VFcOzo0amZwVJW5Sfx2/ ST6AfGQT84aeTIj0UrX2LN53RQkbTquDVFWK5icrXJKoYJAujNZdIt2K1yDu1Ta5OOZIMB +YL5ituxiUQldXM/HnUUKg04R8ozyUtIvmFGr32WYOVzqTVLK6oZ8TbECcDaiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733827924; a=rsa-sha256; cv=none; b=vEwUkxBYJGmaEAAc3vdppKkHPIycDiSHehqn5xfEUn90x8tMG06GOW4TGhswpG8ZxkxvUL 42I5rwQj5DUNvtdXNWEKIG80OvvaVhhQLrzUE16s3+l1C9js18o1/GNPb7eojJ6CHQO2zE nJK6qpenbZJ+9NEH7RQqYZCgevYYkHSq6jdky680kZgoruObFfj4PbFQoHpdVak+Jfv201 ZbnwEMucv0Ay9/5bWfZCH5C+KcsPayuSOw1JIJ9VTrzDCt4JQLv4UI7HBblA0ddhsk29Mu x1JpOEQHw2Wqrd7DMJFDH/JHkW2PCyZ1WXj66Xw7jVPcs1NVvVWzur9f284SPw== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y6wXh1TGnz1CZh; Tue, 10 Dec 2024 10:52:04 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 0B1B61CB5AE; Tue, 10 Dec 2024 11:52:01 +0100 (CET) Date: Tue, 10 Dec 2024 11:52:00 +0100 From: Baptiste Daroussin To: Vladimir Druzenko Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: a5fc087131e6 - main - kmod: append osversion to the portversion Message-ID: References: <202412100817.4BA8H5CD007352@gitrepo.freebsd.org> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Tue 10 Dec 13:32, Vladimir Druzenko wrote: > 10.12.2024 11:17, Baptiste Daroussin пишет: > > 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} > > Hello! > > INDEX have incorrect versions, for example: > virtualbox-ose-additions-6.1.50.1499999 > virtualbox-ose-additions-legacy-5.2.44.1499999_6 > virtualbox-ose-additions-nox11-6.1.50.1499999 > virtualbox-ose-additions-nox11-legacy-5.2.44.1499999_5 > virtualbox-ose-kmod-6.1.50.1499999 > virtualbox-ose-kmod-legacy-5.2.44.1499999_7 > > $ awk -F'|' '{print $1}' /usr/ports/INDEX-14 | grep 1499999 | wc -l >      239 > Ah yes index building... I need to think about it. Index should have died long ago... Best regards, Bapt