[1.5] Makefile: add RUNC_BUILDTAGS, deprecate EXTRA_BUILDTAGS#5198
Merged
lifubang merged 1 commit intoopencontainers:release-1.5from Mar 28, 2026
Merged
[1.5] Makefile: add RUNC_BUILDTAGS, deprecate EXTRA_BUILDTAGS#5198lifubang merged 1 commit intoopencontainers:release-1.5from
lifubang merged 1 commit intoopencontainers:release-1.5from
Conversation
A bit of history. EXTRA_BUILDTAGS was introduced in commit dac4171, as a quick way to add some extra Go build tags to the runc build. Later, commit 767bc00 changed Makefile to not get EXTRA_TAGS from the shell environment, as the name is quite generic and some unrelated environment variable with that name can affect runc build. While such change does make sense, it makes it more complicated to pass build tags in CI and otherwise (see e.g. commit 0e1fe36). Moreover, runc build uses some Go build tags by default (via Makefile), and while it is easy to add more build tags (via EXTRA_BUILDTAGS), in order to remove some existing tags one has to redefine BUILDTAGS from scratch, which is not very convenient (again, see commit 0e1fe36 which gets the current value of BUILDTAGS from the Makefile in order to remove a single tag). To handle all of the above, let's do this: - implement RUNC_BUILDTAGS, fixing the issue of not-so-unique name; - allow to get RUNC_BUILDTAGS from shell environment; - implement a feature to remove a build tag from default set by prefixing it with "-" (as in RUNC_BUILDTAGS="-seccomp"); - document all this in README; - make CI use the new feature; - keep EXTRA_BUILDTAGS for backward compatibility, add a make warning and a TODO to remove it for runc 1.6. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit d8c62c7) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Contributor
Author
|
Now, after backporting PRs containing changelog entries, we are going to have the same/similar entries in two branches. Guess we'll need to de-dup the CHANGELOG in the main branch after each release, removing entries that are already in the backported released versions. |
cyphar
approved these changes
Mar 27, 2026
Member
Let's discuss the workflow for reintegrating the |
lifubang
approved these changes
Mar 28, 2026
This file contains hidden or 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
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.
Backport of #5171 to release-1.5.
A bit of history. EXTRA_BUILDTAGS was introduced in commit dac4171, as a quick way to add some extra Go build tags to the runc build.
Later, commit 767bc00 changed Makefile to not get EXTRA_TAGS from the shell environment, as the name is quite generic and some unrelated environment variable with that name can affect runc build. While such change does make sense, it makes it more complicated to pass build tags in CI and otherwise (see e.g. commit 0e1fe36).
Moreover, runc build uses some Go build tags by default (via Makefile), and while it is easy to add more build tags (via EXTRA_BUILDTAGS), in order to remove some existing tags one has to redefine BUILDTAGS from scratch, which is not very convenient (again, see commit 0e1fe36 which gets the current value of BUILDTAGS from the Makefile in order to remove a single tag).
To handle all of the above, let's do this:
(cherry picked from commit d8c62c7)