From 55a9bbc0335cf535880400915941faa4bb39e6ae Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 12 Mar 2021 18:37:18 +0100 Subject: [PATCH] Prevent runc inheriting BUILDTAGS from containerd Both runc and containerd use BUILDTAGS to customize go build-tags. When building containerd with custom build-tags, runc inherited those, causing the default to be overwritten, e.g.; make BUILDTAGS=no_btrfs cri-cni-release (in script/setup/install-runc) HEAD is now at 12644e61 VERSION: release 1.0.0~rc93 make[1]: Entering directory '/tmp/tmp.ZJzc2KtI0A/runc' go build -trimpath "-mod=vendor" "-buildmode=pie" -tags "no_btrfs" -ldflags "-X main.gitCommit="12644e614e25b05da6fd08a38ffa0cfe1903fdec" -X main.version=1.0.0-rc93 " -o runc . ^^^^^^^^^^^^^^^^ This patch brings back the BUILDTAGS make-var in the runc-install script, which fixates the buildtags to our defaults. Signed-off-by: Sebastiaan van Stijn --- script/setup/install-runc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/setup/install-runc b/script/setup/install-runc index 7717cb1fa..2db853138 100755 --- a/script/setup/install-runc +++ b/script/setup/install-runc @@ -30,7 +30,7 @@ function install_runc() { git clone https://github.com/opencontainers/runc.git "${TMPROOT}"/runc pushd "${TMPROOT}"/runc git checkout "${RUNC_VERSION}" - make + make BUILDTAGS='seccomp' runc make install popd rm -fR "${TMPROOT}"