diff --git a/Makefile b/Makefile index 44706ee8fe..d431bf7adf 100644 --- a/Makefile +++ b/Makefile @@ -48,14 +48,13 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators USERSYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/user-generators -REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp +REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp BUILDTAGS ?= \ $(shell hack/apparmor_tag.sh) \ $(shell hack/btrfs_installed_tag.sh) \ $(shell hack/btrfs_tag.sh) \ $(shell hack/systemd_tag.sh) \ $(shell hack/libsubid_tag.sh) \ - exclude_graphdriver_devicemapper \ seccomp # allow downstreams to easily add build tags while keeping our defaults BUILDTAGS += ${EXTRA_BUILDTAGS} @@ -86,7 +85,7 @@ endif # triggered. SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) -BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay +BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_overlay CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) OCI_RUNTIME ?= "" diff --git a/contrib/cirrus/logformatter.t b/contrib/cirrus/logformatter.t index 0387b8bf48..37703a9d44 100755 --- a/contrib/cirrus/logformatter.t +++ b/contrib/cirrus/logformatter.t @@ -182,7 +182,7 @@ ok 4 blah <<< [05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08. -[+0004s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728432 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -tags " selinux systemd exclude_graphdriver_devicemapper seccomp" -o test/checkseccomp/checkseccomp ./test/checkseccomp +[+0004s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728432 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -tags " selinux systemd seccomp" -o test/checkseccomp/checkseccomp ./test/checkseccomp [+0006s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728434 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -o test/goecho/goecho ./test/goecho [+0006s] ./hack/install_catatonit.sh [+0270s] ------------------------------ @@ -231,7 +231,7 @@ ok 4 blah [+1741s] FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped >>> [05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08. -[+0004s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728432 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -tags " selinux systemd exclude_graphdriver_devicemapper seccomp" -o test/checkseccomp/checkseccomp ./test/checkseccomp +[+0004s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728432 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -tags " selinux systemd seccomp" -o test/checkseccomp/checkseccomp ./test/checkseccomp [+0006s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728434 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -o test/goecho/goecho ./test/goecho ./hack/install_catatonit.sh diff --git a/pkg/machine/e2e/README.md b/pkg/machine/e2e/README.md index ae6873f42d..090c52628f 100644 --- a/pkg/machine/e2e/README.md +++ b/pkg/machine/e2e/README.md @@ -26,7 +26,7 @@ the same result: To focus on one specific test on windows, run `ginkgo` manually: ```pwsh -$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp" +$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp" $focus_file = "basic_test.go" $focus_test = "podman build contexts" ./test/tools/build/ginkgo.exe ` diff --git a/rpm/podman.spec b/rpm/podman.spec index 2baf35cd19..fdbc97d021 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -246,7 +246,7 @@ LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first %gobuild -o bin/rootlessport ./cmd/rootlessport -export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BASEBUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" # libtrust_openssl buildtag switches to using the FIPS-compatible func # `ecdsa.HashSign`. diff --git a/winmake.ps1 b/winmake.ps1 index 3b37c8a2d7..c7aad086c4 100644 --- a/winmake.ps1 +++ b/winmake.ps1 @@ -287,7 +287,7 @@ function Get-Podman-Version{ # Init script $target = $args[0] -$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp" +$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp" switch ($target) { {$_ -in '', 'podman-remote', 'podman'} {