-
Notifications
You must be signed in to change notification settings - Fork 18.7k
cmd/dist: set buildvcs=false when building go-bootstrap #61621
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
|
This PR (HEAD: ec6af18) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/513835. Important tips:
|
When compiling without a Git repository, "go install" returns an error: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Set -buildvcs=false in go install when isGitDir() returns false. Set GOBOOTSTRAP_BUILDVCS=0 to force isGitDir() to return false and thereby set buildvcs=false in "go install" within make.bash (which runs cmd/dist). Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us>
|
Message from Gopher Robot: Patch Set 1: Congratulations on opening your first change. Thank you for your contribution! Next steps: Most changes in the Go project go through a few rounds of revision. This can be During May-July and Nov-Jan the Go project is in a code freeze, during which Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
When compiling without a Git repository, "go install" returns an error: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Set -buildvcs=false in go install when isGitDir() returns false. Set GOBOOTSTRAP_BUILDVCS=0 to force isGitDir() to return false and thereby set buildvcs=false in "go install" within make.bash (which runs cmd/dist). Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically
|
Message from Dmitri Shuralyov: Patch Set 1: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
|
Message from Christian Stewart: Patch Set 1: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
|
This PR (HEAD: bc8159e) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/513835. Important tips:
|
When building go-bootstrap as part of the make.bash process, the cmd/dist
invokes the bootstrap Go compiler to build the go_bootstrap tool:
${GOROOT_BOOTSTRAP}/bin/go install -tags=math_big_pure_go compiler_bootstrap purego bootstrap/cmd/...
If there is an invalid .git directory in a parent of ${GOROOT_BOOTSTRAP},
make.bash will fail. Reproduction of the issue:
mkdir go-issue-61620
cd ./go-issue-61620
wget https://go.dev/dl/go1.19.11.src.tar.gz
mkdir go-bootstrap
tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1
cd ./go-bootstrap/src/
bash make.bash
cd ../../
wget https://go.dev/dl/go1.20.6.src.tar.gz
mkdir go
tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1
printf "gitdir: ../../does/not/exist/.git" > ./.git
cd ./go/src/
GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash
The build fails with the following error:
Building Go toolchain1 using [snip]/go-1.19.10.
error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.
go tool dist: FAILED: [snip]/go-1.19.10/bin/go install -tags=math_big_pure_go \
compiler_bootstrap purego bootstrap/cmd/...: exit status 1
This change unconditionally sets -buildvcs=false when compiling go-bootstrap. We
don't need the revision information in those binaries anyway. Setting this flag
was previously not done as we were unsure if the go-bootstrap compiler would be
new enough to support the buildvcs build flag. Since Go 1.20.x, Go 1.19.x is the
minimum version for go-bootstrap, and supports -buildvcs=false. We can now set
-buildvcs=false without worrying about compatibility.
Related: golang#54852
Fixes: golang#61620
|
Message from Christian Stewart: Patch Set 1: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
|
This PR (HEAD: 6b05378) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/513835. Important tips:
|
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction v2 -> v3: - drop unnecessary go.mk change
|
Message from Christian Stewart: Patch Set 3: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction v2 -> v3: - drop unnecessary go.mk change
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> --- v1 -> v2: - sort HOST_GO_MAKE_ENV alphabetically - simplify the patch to set buildvcs=false unconditionally for go-bootstrap - create a minimal reproduction of the issue - simplify the commit message with the minimal reproduction v2 -> v3: - drop unnecessary go.mk change
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
Message from Bryan Mills: Patch Set 3: (3 comments) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
|
Message from Christian Stewart: Patch Set 3: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit bc8e70a) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit bc8e70a) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
Message from Christian Stewart: Patch Set 3: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/513835. |
|
@seankhliao this is still applicable, can we reopen? |
|
yes, sorry I looked at the wrong linked issue |
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Building host-go within docker fails: error obtaining VCS status: exit status 128 Use -buildvcs=false to disable VCS stamping. Reproduction of the issue: mkdir go-issue-61620 cd ./go-issue-61620 wget https://go.dev/dl/go1.19.11.src.tar.gz mkdir go-bootstrap tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 cd ./go-bootstrap/src/ bash make.bash cd ../../ wget https://go.dev/dl/go1.20.6.src.tar.gz mkdir go tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 printf "gitdir: ../../does/not/exist/.git" > ./.git cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash The error only occurs when the .git that git detects in the parent directory of the GOROOT_BOOTSTRAP is invalid or not present causing errors when running `git` commands within GOROOT_BOOTSTRAP. Report: https://lists.buildroot.org/pipermail/buildroot/2023-July/671344.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525 Upstream issue: golang/go#61620 Upstream PR: golang/go#61621 Signed-off-by: Christian Stewart <christian@aperture.us> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
When building go-bootstrap as part of the make.bash process, the cmd/dist invokes the bootstrap Go compiler to build the go_bootstrap tool:
${GOROOT_BOOTSTRAP}/bin/go install -tags=math_big_pure_go compiler_bootstrap purego bootstrap/cmd/...
If there is an invalid .git directory in a parent of ${GOROOT_BOOTSTRAP}, make.bash will fail. Reproduction of the issue:
mkdir go-issue-61620
cd ./go-issue-61620
wget https://go.dev/dl/go1.19.11.src.tar.gz
mkdir go-bootstrap
tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1
cd ./go-bootstrap/src/
bash make.bash
cd ../../
wget https://go.dev/dl/go1.20.6.src.tar.gz
mkdir go
tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1
printf "gitdir: ../../does/not/exist/.git" > ./.git
cd ./go/src/
GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash
The build fails with the following error:
Building Go toolchain1 using [snip]/go-1.19.10.
error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.
go tool dist: FAILED: [snip]/go-1.19.10/bin/go install -tags=math_big_pure_go
compiler_bootstrap purego bootstrap/cmd/...: exit status 1
This change unconditionally sets -buildvcs=false when compiling go-bootstrap. We don't need the revision information in those binaries anyway. Setting this flag was previously not done as we were unsure if the go-bootstrap compiler would be new enough to support the buildvcs build flag. However, since Go 1.20.x, Go 1.19.x is the minimum version for go-bootstrap, and supports -buildvcs=false. We can now set -buildvcs=false without worrying about compatibility.
Related: #54852
Fixes: #61620