diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 22:12:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 22:12:33 +0200 |
| commit | 1f8c509fafb4ce41970c4f28ed55daec459c7520 (patch) | |
| tree | 65edb58d599b5d8fdbb3cb9d06bb47f9e14140ba /pkg | |
| parent | 986a277a962aef8d975996d494a4522299f6973b (diff) | |
| parent | 9263ed2ab1c87dd798a37ac260e3e81c00a59448 (diff) | |
| download | podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.tar.gz podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.tar.bz2 podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.zip | |
Merge pull request #6478 from rhatdan/abisupport
Remove use of ABISupport buildtag
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_abi.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_abi_unsupported.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_proxy.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_tunnel.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index 6e311dec7..a2b5fc0fc 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package abi diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index d860a8115..0a82b9a6b 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package infra diff --git a/pkg/domain/infra/runtime_abi_unsupported.go b/pkg/domain/infra/runtime_abi_unsupported.go index c4e25e990..3d7d457fc 100644 --- a/pkg/domain/infra/runtime_abi_unsupported.go +++ b/pkg/domain/infra/runtime_abi_unsupported.go @@ -1,4 +1,4 @@ -// +build !ABISupport +// +build remote package infra diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index a57eadc63..2f2b0f90f 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package infra diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index e7002e20f..fed9b1008 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package infra diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index 70e4d37ca..bba7d2c0c 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -1,4 +1,4 @@ -// +build !ABISupport +// +build remote package infra |