diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-03 09:33:52 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-03 15:11:34 -0400 |
| commit | 9263ed2ab1c87dd798a37ac260e3e81c00a59448 (patch) | |
| tree | fde68216341ddc9d49b1155487f6c0ee31a97e07 /cmd | |
| parent | 428303c789243e849f8d88c144c5e7c715510860 (diff) | |
| download | podman-9263ed2ab1c87dd798a37ac260e3e81c00a59448.tar.gz podman-9263ed2ab1c87dd798a37ac260e3e81c00a59448.tar.bz2 podman-9263ed2ab1c87dd798a37ac260e3e81c00a59448.zip | |
Remove use of ABISupport buildtag
We need to default to building podman. If you specify no build
tags you will not build podman, not podman-remote.
Just using remote flag to indicate podman-remote and !remote for
podman.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/registry/config_abi.go | 2 | ||||
| -rw-r--r-- | cmd/podman/registry/config_tunnel.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/service_abi.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/service_unsupported.go | 14 |
4 files changed, 3 insertions, 17 deletions
diff --git a/cmd/podman/registry/config_abi.go b/cmd/podman/registry/config_abi.go index 55430e1bf..4a909c17e 100644 --- a/cmd/podman/registry/config_abi.go +++ b/cmd/podman/registry/config_abi.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package registry diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go index 29e744dac..bb3da947e 100644 --- a/cmd/podman/registry/config_tunnel.go +++ b/cmd/podman/registry/config_tunnel.go @@ -1,4 +1,4 @@ -// +build !ABISupport +// +build remote package registry diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 501650839..f5386c4f1 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -1,4 +1,4 @@ -// +build ABISupport,!remote +// +build linux,!remote package system diff --git a/cmd/podman/system/service_unsupported.go b/cmd/podman/system/service_unsupported.go deleted file mode 100644 index 82272c882..000000000 --- a/cmd/podman/system/service_unsupported.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !ABISupport,!remote - -package system - -import ( - "errors" - - "github.com/containers/libpod/pkg/domain/entities" - "github.com/spf13/pflag" -) - -func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error { - return errors.New("not supported") -} |