aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-01-09 14:20:51 -0500
committerChris Evich <cevich@redhat.com>2020-01-09 14:31:26 -0500
commiteb0f79c3373d41356afd9a6603eeda4794750b1e (patch)
tree5b4f5a00ce6bdbeb1cc5783827b5d7e8ac0b7214
parentf57fdd038d431ebbd59e39b909cab7543b5d8f01 (diff)
downloadpodman-eb0f79c3373d41356afd9a6603eeda4794750b1e.tar.gz
podman-eb0f79c3373d41356afd9a6603eeda4794750b1e.tar.bz2
podman-eb0f79c3373d41356afd9a6603eeda4794750b1e.zip
Fix Makefile ref libseccomp branch as a commit
Commit a824186ac9 mistakenly updated LIBSECCOMP_COMMIT with a branch name instead of a commit reference. This breaks on Ubuntu's git with the `--detach` option, causing it to throw this error: ``` fatal: '--detach' cannot be used with '-b/-B/--orphan' ``` Fix this by using the tag `v2.3.3` which at the time of this commit, is the current HEAD of the release-2.3 branch. Thanks to Ed Santiago <santiago@redhat.com> for helping figure out the error and the fix. Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e082b6e5d..8c04005a8 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ LDFLAGS_PODMAN ?= \
-X $(LIBPOD)/config._etcDir=$(ETCDIR) \
-extldflags "$(LDFLAGS)"
#Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too.
-LIBSECCOMP_COMMIT := release-2.3
+LIBSECCOMP_COMMIT := v2.3.3
# Rarely if ever should integration tests take more than 50min,
# caller may override in special circumstances if needed.
GINKGOTIMEOUT ?= -timeout=90m