[Bug 262600] [PATCH] Incorrect major-only revision used in pkg build target triple, xdev symlink names

From: <bugzilla-noreply_at_freebsd.org>
Date: Mon, 06 Feb 2023 21:15:46 UTC

--- Comment #2 from commit-hook@FreeBSD.org ---
A commit in branch main references this bug:


commit a1e3fb8fa0a4652bc345bd284c32d6630a8dbe08
Author:     Eugene M. Kim <astralblue@gmail.com>
AuthorDate: 2022-03-11 04:32:00 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-02-06 21:02:32 +0000

    Fix _REVISION to be always major.minor

    Introduced in commit 613fe53, _REVISION was redefined to be just the
    major version (14) instead of major.minor (14.0) iff:

      - PKG_VERSION was not overridden (default), and
      - Branch was -CURRENT, -STABLE, or -PRERELEASE.

    This introduced side effects in other parts of the code which expected
    _REVISION to be major.minor:

      - make-pkg-package.sh target triple became amd64-portbld-freebsd14
        (should be amd64-portbld-freebsd14.0);
      - Versioned cross dev symlink name became amd64-freebsd14-<tool>
        (should be amd64-freebsd14.0-<tool>)

    Also, compounded with commit ea9a92d (which was introduced afterward
    and removed minor version from _REVISION incorrectly using :S with a
    regex) this also caused pkgbase repo to use a wrong PKG_ABI with a minor
    version (FreeBSD:14.0:amd64) when a custom PKG_VERSION was specified.
    (Note, without a custom PKG_VERSION the bug was not triggered because in
    that case _REVISION was already major-only.)

    This commit fixes both problems by introducing and using MAJOR_REVISION
    instead of redefining _REVISION.  Existing uses of _REVISION now see
    major.minor again, except PKG_ABI (ex: FreeBSD:14:amd64, as described
    above) and PKG_VERSION (ex: 14.snap20220311121531) need only the major
    version and now use MAJOR_REVISION instead.

    PR: 262600, 262601
    Reviewed by: imp, emaste
    Pull Request: https://github.com/freebsd/freebsd-src/pull/592

 Makefile.inc1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

You are receiving this mail because:
You are the assignee for the bug.