[Bug 294824] Source code installed by freebsd-update does not match release source code as tagged in git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=294824

            Bug ID: 294824
           Summary: Source code installed by freebsd-update does not match
                    release source code as tagged in git
           Product: Base System
           Version: 15.0-STABLE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Many People
          Priority: ---
         Component: kern
          Assignee: bugs@FreeBSD.org
          Reporter: kris@tranception.com

Why is it that on my 15.0-RELEASE-p6 boxes with clean checkouts of
release/15.0.0-p6 in /usr/src, freebsd-update fetch install thinks the source
under /usr/src needs "upgrading"?

I would have thought the code installed by freebsd-update fetch install would
match the code tagged release/15.0.0-p6 (which is also the current HEAD of
releng/15.0)?

Box is running 15.0-RELEASE-p6:

# freebsd-version; uname -vm
15.0-RELEASE-p6
FreeBSD 15.0-RELEASE-p6 GENERIC amd64

Box has clean, updated /usr/src:

# git -C /usr/src remote -v
freebsd https://git.freebsd.org/src.git (fetch)
freebsd https://git.freebsd.org/src.git (push)

# git -C /usr/src log -1 --pretty=short
commit 6b6bc9afa0b09765355f74a2f11cee069e7a37ef (HEAD, tag: release/15.0.0-p6,
freebsd/releng/15.0)
Author: Mark Johnston <markj@FreeBSD.org>

    Add UPDATING entries and bump version

# git -C /usr/src clean -fxdn
# git -C /usr/src status --ignored
HEAD detached at freebsd/releng/15.0
nothing to commit, working tree clean

However when I run freebsd-update, I get this:

# freebsd-update fetch
Looking up update.FreeBSD.org mirrors... 3 mirrors found.
Fetching metadata signature for 15.0-RELEASE from update2.freebsd.org... done.
Fetching metadata index... done.
Inspecting system... done.
Preparing to download files... done.
The following files will be updated as part of updating to
15.0-RELEASE-p6:
/usr/src/sys/amd64/amd64/pmap.c
/usr/src/sys/amd64/amd64/sys_machdep.c
/usr/src/sys/vm/vm_map.c
/usr/src/sys/vm/vm_map.h
/usr/src/tests/sys/posixshm/posixshm_test.c

Installing the "update" then leads to:

# freebsd-update install
Creating snapshot of existing boot environment... done.
Installing updates...
Restarting sshd after upgrade
Performing sanity check on sshd configuration.
Stopping sshd.
Waiting for PIDS: 4277.
Performing sanity check on sshd configuration.
Starting sshd.
 done.

Git now shows differences against release/15.0.0-p6:

# git -C /usr/src status --ignored
HEAD detached at freebsd/releng/15.0
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   sys/amd64/amd64/pmap.c
        modified:   sys/amd64/amd64/sys_machdep.c
        modified:   sys/vm/vm_map.c
        modified:   sys/vm/vm_map.h
        modified:   tests/sys/posixshm/posixshm_test.c

no changes added to commit (use "git add" and/or "git commit -a")

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