From 4f903a21c480443e8dbfc65b083fd05891501c67 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 15 Mar 2017 11:33:02 -0700 Subject: [PATCH] Remove ambient build tag Signed-off-by: Mrunal Patel --- Makefile | 2 +- libcontainer/capabilities_ambient.go | 7 ------- libcontainer/capabilities_linux.go | 2 ++ libcontainer/capabilities_noambient.go | 7 ------- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 libcontainer/capabilities_ambient.go delete mode 100644 libcontainer/capabilities_noambient.go diff --git a/Makefile b/Makefile index ef333cd53..b82884af6 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ static: $(SOURCES) CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty release: - @flag_list=(seccomp selinux apparmor static ambient); \ + @flag_list=(seccomp selinux apparmor static); \ unset expression; \ for flag in "$${flag_list[@]}"; do \ expression+="' '{'',$${flag}}"; \ diff --git a/libcontainer/capabilities_ambient.go b/libcontainer/capabilities_ambient.go deleted file mode 100644 index 50da2832f..000000000 --- a/libcontainer/capabilities_ambient.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build linux,ambient - -package libcontainer - -import "github.com/syndtr/gocapability/capability" - -const allCapabilityTypes = capability.CAPS | capability.BOUNDS | capability.AMBS diff --git a/libcontainer/capabilities_linux.go b/libcontainer/capabilities_linux.go index c43de459d..8981b2a2f 100644 --- a/libcontainer/capabilities_linux.go +++ b/libcontainer/capabilities_linux.go @@ -11,6 +11,8 @@ import ( "github.com/syndtr/gocapability/capability" ) +const allCapabilityTypes = capability.CAPS | capability.BOUNDS | capability.AMBS + var capabilityMap map[string]capability.Cap func init() { diff --git a/libcontainer/capabilities_noambient.go b/libcontainer/capabilities_noambient.go deleted file mode 100644 index 752c4e516..000000000 --- a/libcontainer/capabilities_noambient.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build !ambient,linux - -package libcontainer - -import "github.com/syndtr/gocapability/capability" - -const allCapabilityTypes = capability.CAPS | capability.BOUNDS