opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6478 from rhatdan/abisupport

Browse Source 
Remove use of ABISupport buildtag
This commit is contained in:
OpenShift Merge Robot
2020-06-03 22:12:33 +02:00
committed by GitHub
parent 986a277a96 9263ed2ab1
commit 1f8c509faf
12 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -22,7 +22,7 @@ ETCDIR ?= /etc
TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d
SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system
USERSYSTEMDDIR ?= ${PREFIX}/lib/systemd/user USERSYSTEMDDIR ?= ${PREFIX}/lib/systemd/user
REMOTETAGS ?= !ABISupport remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp
BUILDTAGS ?= \ BUILDTAGS ?= \
$(shell hack/apparmor_tag.sh) \ $(shell hack/apparmor_tag.sh) \
$(shell hack/btrfs_installed_tag.sh) \ $(shell hack/btrfs_installed_tag.sh) \
@ -44,7 +44,7 @@ ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
endif endif
BUILDTAGS_CROSS ?= ABISupport containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
ifneq (,$(findstring varlink,$(BUILDTAGS))) ifneq (,$(findstring varlink,$(BUILDTAGS)))
PODMAN_VARLINK_DEPENDENCIES = pkg/varlink/iopodman.go PODMAN_VARLINK_DEPENDENCIES = pkg/varlink/iopodman.go
endif endif
@ -185,7 +185,7 @@ ifeq (,$(findstring systemd,$(BUILDTAGS)))
@echo "Podman is being compiled without the systemd build tag. Install libsystemd on \ @echo "Podman is being compiled without the systemd build tag. Install libsystemd on \
Ubuntu or systemd-devel on rpm based distro for journald support." Ubuntu or systemd-devel on rpm based distro for journald support."
endif endif
$(GO_BUILD) $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "ABISupport $(BUILDTAGS)" -o $@ $(PROJECT)/cmd/podman $(GO_BUILD) $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/podman
.PHONY: podman .PHONY: podman
podman: bin/podman podman: bin/podman

2
cmd/podman/registry/config_abi.go
View File

@ -1,4 +1,4 @@
// +build ABISupport // +build !remote
package registry package registry

2
cmd/podman/registry/config_tunnel.go
View File

@ -1,4 +1,4 @@
// +build !ABISupport // +build remote
package registry package registry

2
cmd/podman/system/service_abi.go
View File

@ -1,4 +1,4 @@
// +build ABISupport,!remote // +build linux,!remote
package system package system

14
cmd/podman/system/service_unsupported.go
View File

@ -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")
}

6
hack/golangci-lint.sh
View File

@ -5,12 +5,12 @@
declare -A BUILD_TAGS declare -A BUILD_TAGS
# TODO: add systemd tag # TODO: add systemd tag
BUILD_TAGS[default]="apparmor,seccomp,selinux" BUILD_TAGS[default]="apparmor,seccomp,selinux"
BUILD_TAGS[abi]="${BUILD_TAGS[default]},ABISupport,varlink,!remoteclient" BUILD_TAGS[abi]="${BUILD_TAGS[default]},varlink,!remoteclient"
BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},!ABISupport,varlink,remoteclient" BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote,varlink,remoteclient"
declare -A SKIP_DIRS declare -A SKIP_DIRS
SKIP_DIRS[abi]="" SKIP_DIRS[abi]=""
# TODO: add "ABISupport" build tag to pkg/api # TODO: add "remote" build tag to pkg/api
SKIP_DIRS[tunnel]="pkg/api" SKIP_DIRS[tunnel]="pkg/api"
[[ $1 == run ]] && shift [[ $1 == run ]] && shift

2
pkg/domain/infra/abi/manifest.go
View File

@ -1,4 +1,4 @@
// +build ABISupport // +build !remote
package abi package abi

2
pkg/domain/infra/runtime_abi.go
View File

@ -1,4 +1,4 @@
// +build ABISupport // +build !remote
package infra package infra

2
pkg/domain/infra/runtime_abi_unsupported.go
View File

@ -1,4 +1,4 @@
// +build !ABISupport // +build remote
package infra package infra

2
pkg/domain/infra/runtime_libpod.go
View File

@ -1,4 +1,4 @@
// +build ABISupport // +build !remote
package infra package infra

2
pkg/domain/infra/runtime_proxy.go
View File

@ -1,4 +1,4 @@
// +build ABISupport // +build !remote
package infra package infra

2
pkg/domain/infra/runtime_tunnel.go
View File

@ -1,4 +1,4 @@
// +build !ABISupport // +build remote
package infra package infra