From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5F7C224AF1; Sun, 17 May 2026 10:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779013459; cv=none; b=ZubYyvMjuNYry4F4kMy6eM2MKhyDRg9A/CzhETFlnyY/IkY2JHy1YDCQCMZMdkXlZyZD/hrwM+/5mMeVaPnICztqqMQP+vz12CsXTvhaCSJYnRptSpdyUj4F8WEgbEoXcmDs4/PHol4n+cdXWhHI5uZAgjI3MMuchrdTLQR1Qu4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779013459; c=relaxed/simple; bh=An+8CvfiXuYtMX7uVmnOB4QJrSlcoZPJB8t/6H5/Mz4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Sw+jKbq8PqQcPvOE9ZS2XXZ2pyNp+96y5Pik6q5zN7DEMiSoH5Z5Jv8xN76Wux3aRZxEdkyeqJmRlg0TmaCm0Du7vo3L2MCmK8v2wv5jMuoDGZg1Zzr5IOnqqKx3DLOmgQHCykJ0eHXrphMgSSh3S8hlbr95fo7AKwefR5h/b5U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uPt31HNN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uPt31HNN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC3A2C2BCB0; Sun, 17 May 2026 10:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779013459; bh=An+8CvfiXuYtMX7uVmnOB4QJrSlcoZPJB8t/6H5/Mz4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uPt31HNNmBrLphjw9K10R6Qg/CVMJmY1purGEw6920hTrFacYlKGzd+tk9fBkZRbI /MfbQmVxzHwrEjbh+d+x76kvXo5lk3DUiU5m4SLtx8o8yGcQYSEJj0+sawm+fW6mWD K5cFek6mp5eZJppXmtJXHVzvjwehvko3HE9D3xT6iN/j2zcCIDbnNp9QkayJ9APpDm Cl9/n29NGKk9NTNgKOI9NYgexfD8LzvS8KcESK+AxYk40Kj4urM/tnE3CFzHLaSwZf RNfMA5rYqRVxC0NAUXTgauDE3+BBu9gNZOSRvuHMiHG+wyHLbfr250+d745UkT0o0D XIipeNLUH8X0g== Date: Sun, 17 May 2026 19:24:15 +0900 From: Nathan Chancellor To: Viktor =?iso-8859-1?Q?J=E4gersk=FCpper?= , Nicolas Schier Cc: Thomas =?iso-8859-1?Q?Wei=DFschuh?= , Christian Heusel , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] kbuild: pacman-pkg: make "rc" releases adhere to pacman versioning scheme Message-ID: <20260517102415.GA1866872@ax162> References: <20260515215913.92481-1-viktor_jaegerskuepper@freenet.de> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260515215913.92481-1-viktor_jaegerskuepper@freenet.de> On Fri, May 15, 2026 at 11:58:45PM +0200, Viktor Jägersküpper wrote: > The package versioning scheme does not enable smooth upgrades from "rc" > releases to the corresponding stable releases (e.g. 7.0.0-rc7 -> 7.0.0) > because pacman considers that a downgrade due to the underscore in > pkgver (e.g. 7.0.0_rc7), see e.g. vercmp(8) for an explanation of the > package version comparison used by pacman. Package versions which are > derived from said releases (e.g. built from git revisions) are > similarly affected. Fix this by modifying pkgver in order to remove the > hyphen from kernel versions containing "-rcN", where N is a > non-negative integer. > > Acked-by: Thomas Weißschuh > Signed-off-by: Viktor Jägersküpper Nicolas, do you want to take this as a fix for 7.1 (since it seems reasonable to correct this for folks building from upstreaam sooner rather than later)? If so: Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Otherwise, I can pick it up for 7.2 when I am fully back online in a couple of days. > --- > v1 -> v2: > - make the substitution more restrictive > - enhance commit message accordingly > - add Acked-by tag > > v1: https://lore.kernel.org/linux-kbuild/20260513231745.51780-1-viktor_jaegerskuepper@freenet.de/ > > BTW this also works for something like "5.10.248-rt143-rc1" which is a > recent example of an "rc" release of a realtime kernel. > > scripts/package/PKGBUILD | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD > index 452374d63c24..1213c8e04671 100644 > --- a/scripts/package/PKGBUILD > +++ b/scripts/package/PKGBUILD > @@ -10,7 +10,7 @@ for pkg in $_extrapackages; do > pkgname+=("${pkgbase}-${pkg}") > done > > -pkgver="${KERNELRELEASE//-/_}" > +pkgver="$(echo "${KERNELRELEASE}" | sed 's/-\(rc[0-9]\+\)/\1/;s/-/_/g')" > # The PKGBUILD is evaluated multiple times. > # Running scripts/build-version from here would introduce inconsistencies. > pkgrel="${KBUILD_REVISION}" > > --- > base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731 > > Best regards, > Viktor > -- > 2.54.0 -- Cheers, Nathan