Skip to content
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

[1.2] libc/int/userns: add build tag to C file #4619

Merged
merged 1 commit into from
Feb 7, 2025

Conversation

kolyshkin
Copy link
Contributor

Backport of #4616 to release-1.2.


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

(cherry picked from commit ccb589b)

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]>
(cherry picked from commit ccb589b)
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin added this to the 1.2.5 milestone Feb 7, 2025
@kolyshkin kolyshkin added the backport/1.2-pr A backport PR to release-1.2 label Feb 7, 2025
@kolyshkin kolyshkin marked this pull request as ready for review February 7, 2025 03:13
@AkihiroSuda AkihiroSuda merged commit d0ed7f7 into opencontainers:release-1.2 Feb 7, 2025
40 checks passed
@kolyshkin
Copy link
Contributor Author

Ended up finding out it's not needed for a variety of reasons (see k3s-io/k3s#11722 (comment) for details).

Won't hurt either, so let's consider this change a NOP.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.2-pr A backport PR to release-1.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants