Bug: [sonic-frr][202511] sonic-frr submodule pointing to 10.3 - should be 10.4.1

[mattkim25]

Is it platform specific

generic

Importance or Severity

Critical

Description of the bug

On the 202511 branch, the sonic-frr submodule does not point to the correct commit. Instead of pointing to frr version 10.4.1, it points to 10.3.

In the original PR that upgraded the frr version in the 202511 branch, it does not include updating the ref pointer. #24706

However, in the master branch, the sonic-frr submodule correctly points to 10.4.1, and the PR to upgrade from 10.3.1 to 10.4.1 correctly updated the ref pointer.
#24330

Note: Does not fail build

This incorrect commit pointer does not impact the build process because on line 17-18 of sonic-buildimage/src/sonic-frr/Makefile, the make file checks out the sonic-frr branch frr-10.4.1.

Line 14-18 of sonic-buildimage/src/sonic-frr/Makefile

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
	# Build the package
	pushd ./frr
	git fetch origin $(FRR_BRANCH)
	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH) || git checkout $(FRR_BRANCH)

The environment variable (FRR_BRANCH) is defined on line 5 in sonic-buildimage/rules/frr.mk.

FRR_VERSION = 10.4.1
FRR_SUBVERSION = 0
FRR_BRANCH = frr-10.4.1
FRR_TAG = frr-10.4.1

Steps to Reproduce

In sonic-buildimage 202511, run git ls-tree HEAD src/sonic-frr/frr

ubuntu@ubuntu:~/sonic-buildimage$ git branch
* 202511
ubuntu@ubuntu:~/sonic-buildimage$ git ls-tree HEAD src/sonic-frr/frr
160000 commit 85cf1ed576deed121751e16a64970f8a652a9e1e  src/sonic-frr/frr

This commit points to sonic-frr branch 10.3
sonic-net/sonic-frr@85cf1ed

Actual Behavior and Expected Behavior

Expected behavior would be to see the sonic-frr submodule pointing to the commit for 10.4.1. However, it is incorrectly pointing to 10.3.

Relevant log output

Output of show version, show techsupport

Attach files (if any)

No response

[mattkim25]

Can someone tag this for 202511? Thanks.