File tree Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -48,14 +48,13 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system
48
48
USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
49
49
SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
50
50
USERSYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/user-generators
51
- REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp
51
+ REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp
52
52
BUILDTAGS ?= \
53
53
$(shell hack/apparmor_tag.sh) \
54
54
$(shell hack/btrfs_installed_tag.sh) \
55
55
$(shell hack/btrfs_tag.sh) \
56
56
$(shell hack/systemd_tag.sh) \
57
57
$(shell hack/libsubid_tag.sh) \
58
- exclude_graphdriver_devicemapper \
59
58
seccomp
60
59
# allow downstreams to easily add build tags while keeping our defaults
61
60
BUILDTAGS += ${EXTRA_BUILDTAGS}
86
85
# triggered.
87
86
SOURCES = $(shell find . -path './.* ' -prune -o \( \( -name '* .go' -o -name '* .c' \) -a ! -name '*_test.go' \) -print)
88
87
89
- BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
88
+ BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_overlay
90
89
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
91
90
OCI_RUNTIME ?= ""
92
91
Original file line number Diff line number Diff line change @@ -182,7 +182,7 @@ ok 4 blah
182
182
183
183
<<<
184
184
[05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08.
185
- [+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
185
+ [+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
186
186
[+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
187
187
[+0006s] ./hack/install_catatonit.sh
188
188
[+0270s] ------------------------------
@@ -231,7 +231,7 @@ ok 4 blah
231
231
[+1741s] FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped
232
232
>>>
233
233
[05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08.
234
- <span class="timestamp">[+0004s] </span>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
234
+ <span class="timestamp">[+0004s] </span>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
235
235
<span class="timestamp">[+0006s] </span>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
236
236
<span class="timestamp"> </span>./hack/install_catatonit.sh
237
237
</pre>
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ the same result:
26
26
To focus on one specific test on windows, run ` ginkgo ` manually:
27
27
28
28
``` pwsh
29
- $remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp"
29
+ $remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
30
30
$focus_file = "basic_test.go"
31
31
$focus_test = "podman build contexts"
32
32
./test/tools/build/ginkgo.exe `
Original file line number Diff line number Diff line change @@ -246,7 +246,7 @@ LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT"
246
246
# build rootlessport first
247
247
%gobuild -o bin/rootlessport ./cmd/rootlessport
248
248
249
- export BASEBUILDTAGS= "seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
249
+ export BASEBUILDTAGS= "seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
250
250
251
251
# libtrust_openssl buildtag switches to using the FIPS-compatible func
252
252
# `ecdsa.HashSign`.
Original file line number Diff line number Diff line change @@ -287,7 +287,7 @@ function Get-Podman-Version{
287
287
# Init script
288
288
$target = $args [0 ]
289
289
290
- $remotetags = " remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp"
290
+ $remotetags = " remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
291
291
292
292
switch ($target ) {
293
293
{$_ -in ' ' , ' podman-remote' , ' podman' } {
You can’t perform that action at this time.
0 commit comments