From e45af45053a81a1c0ea64597fba8bc9a7b9616b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Mon, 6 Mar 2017 21:25:33 +0100
Subject: [PATCH] Always build with -tags=containers_image_openpgp

---
 hack/common.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hack/common.sh b/hack/common.sh
index 0aa0ee587513..c1c425010946 100755
--- a/hack/common.sh
+++ b/hack/common.sh
@@ -175,6 +175,8 @@ os::build::internal::build_binaries() {
     version_ldflags=$(os::build::ldflags)
 
     # Use eval to preserve embedded quoted strings.
+    local common_gotags
+    common_gotags='containers_image_openpgp'
     local goflags
     eval "goflags=(${OS_GOFLAGS:-})"
 
@@ -222,7 +224,7 @@ os::build::internal::build_binaries() {
       if [[ ${#nonstatics[@]} -gt 0 ]]; then
         GOOS=${platform%/*} GOARCH=${platform##*/} go install \
           -pkgdir "${OS_OUTPUT_PKGDIR}/${platform}" \
-          -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_envvar:-}" \
+          -tags "${common_gotags} ${OS_GOFLAGS_TAGS-} ${!platform_gotags_envvar:-}" \
           -ldflags "${version_ldflags}" \
           "${goflags[@]:+${goflags[@]}}" \
           "${nonstatics[@]}"
@@ -239,7 +241,7 @@ os::build::internal::build_binaries() {
         # disabling cgo allows use of delve
         CGO_ENABLED=0 GOOS=${platform%/*} GOARCH=${platform##*/} go test \
           -pkgdir "${OS_OUTPUT_PKGDIR}/${platform}" \
-          -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_test_envvar:-}" \
+          -tags "${common_gotags} ${OS_GOFLAGS_TAGS-} ${!platform_gotags_test_envvar:-}" \
           -ldflags "${version_ldflags}" \
           -i -c -o "${outfile}" \
           "${goflags[@]:+${goflags[@]}}" \