runc: set COMMIT via make arg #219
Merged
Conversation
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
cpuguy83
changed the title
cpuguy83
force-pushed
the
runc_1.2_fixes
branch
from
a27c536 to
8b96ab3
Compare
pmengelbert
requested changes
Dec 31, 2024
packages/moby-runc/deb.mk
Outdated
| runc: | ||
| cd src && \ | ||
| $(MAKE) runc BUILDTAGS='seccomp' VERSION="${VERSION}-${REVISION}" | ||
| $(MAKE) runc BUILDTAGS='seccomp urfave_cli_no_docs' VERSION="${VERSION}-${REVISION}" COMMIT=${COMMIT} |
Contributor
There was a problem hiding this comment.
Suggested change
| $(MAKE) runc BUILDTAGS='seccomp urfave_cli_no_docs' VERSION="${VERSION}-${REVISION}" COMMIT=${COMMIT} | |
| $(MAKE) runc BUILDTAGS='seccomp urfave_cli_no_docs' VERSION="${VERSION}-${REVISION}" COMMIT="${COMMIT}" |
rpm.mk has quotes around ${COMMIT}, so this should too.
The makefile for runc no longer supports setting COMMIT (and some other things) through env var and instead must be set through make args. Additionally adds `urfave_cli_no_docs` which is added to the base BUILDTAGS in 1.2 but is not set in 1.1. This just makes it so the build tag is set on both 1.1 and 1.2 instead of relying on the make file for those tags across branches. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
runc_1.2_fixes
branch
from
8b96ab3 to
5be3bd6
Compare
pmengelbert
approved these changes
Dec 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The makefile for runc no longer supports setting COMMIT (and some other things) through env var and instead must be set through make args.
Additionally adds
urfave_cli_no_docswhich is added to the base BUILDTAGS in 1.2 but is not set in 1.1.This just makes it so the build tag is set on both 1.1 and 1.2 instead of relying on the make file for those tags across branches.