libc/int/userns: add build tag to C file #4616
Open
+2
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes k3s cross-compilation on Windows, broken by commit 1912d59 ("*: actually support joining a userns with a new container"). [@kolyshkin: commit message] Fixes: 1912d59 Signed-off-by: Brad Davidson <[email protected]> Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
added
the
backport/1.2-todo
|
@brandond PTAL. Sorry if you have reported the issue before but we missed it. Also, if you can suggest a way to test this, that'd be great. |
|
I think the underlying issue is that runc isn't normally used on windows. On windows you use runhcs instead. However, K3s links in some of the runc libcontainer library code on windows, so we do need build tags on stuff that only works on linux. I did ping @cyphar internally a while back but I haven't followed up. |
rata
approved these changes
Feb 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes k3s cross-compilation on Windows, broken by commit 1912d59 ("*: actually support joining a userns with a new container").
[@kolyshkin: commit message]
Fixes: 1912d59
As far as I can see, this is first mentioned in k3s-io/k3s#9332 a year ago but was never reported to runc 😞
Indeed, Go recognizes
//go:buildin C files, and also matches GOOS and GOARCH in file names even for.cfiles.Also, I don't know how to reproduce it here (
GOOS=windows CGO_ENABLED=1 go build ./libcontainer/...gives too many errors).