package/util-linux: bump version to 2.39.1
PATCH 1/1 package/util-linux: bump version to 2.39.1
Release notes:
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/v2.39.1-ReleaseNotes
"The main objective of this maintenance release is to address bugs in libmount and resolve the regression that occurred due to the v2.39 rewrite for the new kernel mount interface."
It also fix a build issue with waitpid program when built with a toolchain with headers < 5.3 detected in our gitlab-ci TestDockerCompose.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/4664846019
---
TestDockerCompose still fail due to a recent update:
# github.com/moby/buildkit/frontend/gateway/client vendor/github.com/moby/buildkit/frontend/gateway/client/client.go:18:29: Reference does not implement comparable note: module requires Go 1.20 # github.com/docker/compose/v2/internal/tracing internal/tracing/tracing.go:102:22: undefined: errors.Join note: module requires Go 1.20
Reverting 490882ada94cf98da145feb4e7e47302aa31104f allows to pass TestDockerCompose.
--- package/util-linux/Config.in | 11 +++++++++++ package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-)
package/util-linux/Config.in +11 -0
@@ -436,6 +436,17 @@ config BR2_PACKAGE_UTIL_LINUX_VIPW help Edit the password, group, shadow-password or shadow-group file +config BR2_PACKAGE_UTIL_LINUX_WAITPID + bool "waitpid" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 # pidfd_open + help + Utility to wait for arbitrary processes + +comment "waitpid needs a toolchain w/ headers >= 5.3" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + config BR2_PACKAGE_UTIL_LINUX_WALL bool "wall" depends on BR2_USE_MMU # fork()
package/util-linux/util-linux.hash +1 -1
@@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb util-linux-2.39.tar.xz +sha256 890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b util-linux-2.39.1.tar.xz # License files, locally calculated sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause
package/util-linux/util-linux.mk +2 -1
@@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
@@ -184,6 +184,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WAITPID),--enable-waitpid,--disable-waitpid) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 18 lines · On Fri, 21 Jul 2023 23:31:21 +0200 Romain Naour <[email protected]> wrote:
Release notes:
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/v2.39.1-ReleaseNotes"The main objective of this maintenance release is to address bugs in libmount and resolve the regression that occurred due to the v2.39 rewrite for the new kernel mount interface."
It also fix a build issue with waitpid program when built with a toolchain with headers < 5.3 detected in our gitlab-ci TestDockerCompose.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/4664846019Signed-off-by Romain Naour <[email protected]>---
TestDockerCompose still fail due to a recent update:
Quoted 8 lines
# github.com/moby/buildkit/frontend/gateway/client vendor/github.com/moby/buildkit/frontend/gateway/client/client.go:18:29: Reference does not implement comparable note: module requires Go 1.20 # github.com/docker/compose/v2/internal/tracing internal/tracing/tracing.go:102:22: undefined: errors.Join note: module requires Go 1.20Reverting
490882ada94cf98da145feb4e7e47302aa31104fallows to pass TestDockerCompose.
Christian, could you have a look at this issue?
In the mean time, I have applied Romain's patch, which is needed (but not sufficient) to fix TestDockerCompose.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas, Romain,
Quoted 6 lines · Thomas Petazzoni
Quoted 1 line
Reverting
490882ada94cf98da145feb4e7e47302aa31104fallows to pass TestDockerCompose.Christian, could you have a look at this issue?
In the mean time, I have applied Romain's patch, which is needed (but not sufficient) to fix TestDockerCompose.
The TestDockerCompose test now completes successfully following the merge of Go 1.20.x
Thanks,
Christian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Christian,
Le 24/07/2023 à 03:04, Christian Stewart via buildroot a écrit :
Quoted 7 lines
Thomas, Romain,
Quoted 2 lines · Thomas Petazzoni
Quoted 1 line
Reverting
490882ada94cf98da145feb4e7e47302aa31104fallows to pass TestDockerCompose.
Quoted 7 lines
Quoted 4 lines
Christian, could you have a look at this issue?
In the mean time, I have applied Romain's patch, which is needed (but not sufficient) to fix TestDockerCompose.
The TestDockerCompose test now completes successfully following the merge of Go 1.20.x
Thanks for taking care of go packages!
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
Best regards,
Romain
Quoted 7 lines
Thanks,
Christian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Romain,
Quoted 2 lines · Romain Naour
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
It definitely works; I'm running many builds a day with it.
Will check into why this CI job failed right away.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
Is "git" installed by any chance?
Thanks,
Christian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Romain,
Quoted 9 lines · Christian Stewart
Quoted 2 lines · Romain Naour
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
It definitely works; I'm running many builds a day with it.
Will check into why this CI job failed right away.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
Quoted 8 lines
Quoted 6 lines
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
Is "git" installed by any chance?
I believe this issue is a regression in Go related to this:
https://github.com/golang/go/issues/54852
Originally the Gentoo maintainers asked for the build to not need Git,
There's code which looks for a VERSION file in the root of the Go sources:
... but only when isGitRepo() returns false (not in a Git working directory).
It seems that -buildvcs=false is not set in the "go install" command regardless of isGitRepo().
Gentoo does not do anything special here:
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-lang/go/go-1.20.6.ebuild#n149
... so I believe that Gentoo usually has the .git tree setup correctly on build with go1.20.6.
I believe there's a few upstreamable fixes here:
- Set -buildvcs={isGitDir()} in the "go install" command in make.bash
- Add an environment variable GOBOOTSTRAP_BUILDVCS which can override this.
And to fix in Buildroot:
- Add GOBOOTSTRAP_BUILDVCS=0
I'll submit a patch series with the Go patch shortly and will look into upstreaming as well.
Best,
Christian Stewart
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Romain,
Quoted 8 lines · Christian Stewart
Quoted 7 lines · Christian Stewart
Quoted 2 lines · Romain Naour
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
Will check into why this CI job failed right away.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
It took me a long time to find a reproduction for this issue,
I finally traced it: if there is an invalid .git in any parent directory of the GOROOT_BOOTSTRAP, the build will fail. Reproduction:
``` # This reproduction sets up a directory structure that breaks Go make.bash. # make.bash should not break due to .git files outside of the Go sources. # # The error specifically occurs when an invalid .git is present in a parent git # directory of the GOROOT_BOOTSTRAP. Go issue #61620 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 # Build fails using -buildvcs=false errors. ```
Submitted to the go issue tracker: https://github.com/golang/go/issues/61620
Best regards,
Christian Stewart
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Christian,
Le 28/07/2023 à 06:24, Christian Stewart a écrit :
Quoted 12 lines
Romain,
Quoted 9 lines · Christian Stewart
Quoted 8 lines · Christian Stewart
Quoted 2 lines · Romain Naour
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
Will check into why this CI job failed right away.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
It took me a long time to find a reproduction for this issue,
Maybe just run utils/docker-run with support/testing/run-tests to reproduce the issue with the same environment as the gitlab-ci job ?
Quoted 27 lines
I finally traced it: if there is an invalid .git in any parent directory of the
GOROOT_BOOTSTRAP, the build will fail. Reproduction:``` # This reproduction sets up a directory structure that breaks Go make.bash. # make.bash should not break due to .git files outside of the Go sources. # # The error specifically occurs when an invalid .git is present in a parent git # directory of the GOROOT_BOOTSTRAP. Go issue #61620 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 # Build fails using -buildvcs=false errors. ```
Quoted 1 line
Submitted to the go issue tracker: https://github.com/golang/go/issues/61620
Nice!
Best regards,
Romain
Quoted 3 lines
Best regards,
Christian Stewart
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Romain,
Quoted 24 lines · Romain Naour
Hello Christian,
Quoted 3 lines · Christian Stewart
Romain,
On Thu, Jul 27, 2023 at 2:33 PM Christian Stewart <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
On Thu, Jul 27, 2023 at 2:20 PM Christian Stewart <
Quoted 1 line · [email protected]> wrote:
Quoted 1 line
Quoted 1 line
On Thu, Jul 27, 2023 at 1:47 PM Romain Naour <[email protected]>
Quoted 9 lines · wrote:
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
It seems the go bootstrap doesn't work even after Go 1.20.x merge, see [1]
Will check into why this CI job failed right away.
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
...
Building Go toolchain1 using[...]test-output/TestMender/host/lib/go-1.19.10.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
It took me a long time to find a reproduction for this issue,
Maybe just run utils/docker-run with support/testing/run-tests to reproduce the
issue with the same environment as the gitlab-ci job ?
It doesn't reproduce reliably that way. With a fresh buildroot checkout, the bug did not occur. Only happens if there's something wrong in .git.
However I did reproduce it by removing the git dir mount, which is how undiscovered finally that the bug is specifically when go-bootstrap lib has a broken .git in a parent directory.
Best,
Christian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Christian, All,
On 2023-07-27 21:24 -0700, Christian Stewart via buildroot spake thusly:
Quoted 12 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-go 1.20.6 Building
...
Building Go toolchain1 using [...]test-output/TestMender/host/lib/go-1.19.10. error obtaining VCS status: exit status 128
Use -buildvcs=false to disable VCS stamping.[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4725186525
It took me a long time to find a reproduction for this issue,
I finally traced it: if there is an invalid .git in any parent directory of the
GOROOT_BOOTSTRAP, the build will fail. Reproduction:
# This reproduction sets up a directory structure that breaks Go make.bash.
Quoted 16 lines
# make.bash should not break due to .git files outside of the Go sources. # # The error specifically occurs when an invalid .git is present in a parent git # directory of the GOROOT_BOOTSTRAP. Go issue #61620 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
So, I believe this would be fixed by the recent change by Brandon:
90790790925c utils/docker-run: fix support for git-worktrees
Regards,
Yann E. MORIN.
Quoted 13 lines
cd ./go/src/ GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash # Build fails using -buildvcs=false errors.
```Submitted to the go issue tracker: https://github.com/golang/go/issues/61620
Best regards,
Christian Stewart
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot