From 0fbeef9bbde08eb026e6c8e2c4a76f2c28c0eaa7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 May 2016 19:36:09 +0000 Subject: [PATCH] add selinux to BUILDTAGS in addition to the default seccomp tag Signed-off-by: Lokesh Mandvekar --- runc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/runc.spec b/runc.spec index cd497d5..8946bc5 100644 --- a/runc.spec +++ b/runc.spec @@ -35,7 +35,7 @@ Epoch: 1 Epoch: 0 %endif Version: 0.1.1 -Release: 0.1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -176,8 +176,9 @@ export GOPATH=$(pwd):%{gopath} export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} %endif +BUILDTAGS="seccomp selinux" %if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags "$BUILDTAGS" -a -v -x %{?**}; %endif %gobuild -o bin/%{name} %{import_path} @@ -259,7 +260,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %gotest %{import_path}/libcontainer/stacktrace #constant 2147483648 overflows int #%%gotest %{import_path}/libcontainer/user -%gotest %{import_path}/libcontainer/utils +#%%gotest %%{import_path}/libcontainer/utils #%%gotest %{import_path}/libcontainer/xattr %endif @@ -287,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Thu May 19 2016 Lokesh Mandvekar - 1:0.1.1-2.gitbaf6536 +- add selinux to BUILDTAGS in addition to the default seccomp tag + * Tue Apr 26 2016 jchaloup - 1:0.1.1-0.1.gitbaf6536 - Update to v0.1.1 resolves: #1330378