There is a problem with the pkgbase package versions for 14.0-RELEASE. Looking at my overnight builds and comparing releng/14.0 with releng/13.2, I see that the package versions for 14 don't include the minor revision: # ls releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13* releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13.2p5.pkg # ls releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14* releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14.pkg This is a surprising change from the versioning used for earlier releases and will cause package version conflicts in the future for 14.1 and later. The problem seems to be caused by commit a1e3fb8fa0a4652bc345bd284c32d6630a8dbe08 which changes PKG_VERSION to use ${MAJOR_REVISION} instead of ${_REVISION}.
A suggested fix: https://reviews.freebsd.org/D42562
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=21e9018ae19662db643a21064150da866bc7beb4 commit 21e9018ae19662db643a21064150da866bc7beb4 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2023-11-13 14:46:36 +0000 pkgbase: use <major>.<minor> format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=da7e9601a99afd3f8777f6ae62fd51e601e15085 commit da7e9601a99afd3f8777f6ae62fd51e601e15085 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2023-11-16 08:19:08 +0000 pkgbase: use <major>.<minor> format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Created attachment 246462 [details] Draft errata notice
that reads pretty good
Hey, Are there any plans to MFC this to the releng/14.0 branch? I see this has been merged to the stable/14 branch a couple of weeks back. The 14.0-RELEASE-p1 tag did go out a couple of days ago, it would be nice to have this patched in release too.
I do plan to merge this to releng/14.0 - I just need to figure out how the re@ process works for merges from stable to releng.
A commit in branch releng/14.0 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3edd66d15e6af1bf7e393a01f1a126dfa55fff commit ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-12-04 14:05:27 +0000 pkgbase: use <major>.<minor> format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 Approved by: so Security: FreeBSD-EN-23:19.pkgbase (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) (cherry picked from commit da7e9601a99afd3f8777f6ae62fd51e601e15085) Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
I think there's nothing left to do here? Will the pkgbase builder automatically pick this up?
they will pick that automatically, but only for the packages which changes since the last build (incremental update), so to be clean I might have to nuke the existing packages and rebuild all of them from scratch, I keep an eye on it, and action if needed.
I can confirmed it worked just fine, so all new packages are now properly named 14.0p2 Note that the packages that didn't change since the first build are still named 14.rc4 but this is another story
I think, based on the above, that there's nothing left to do here. Please re-open if I'm wrong.