Skip to content

Commit 60692ca

Browse files
committed
Remove exclude_graphdriver_devicemapper build tag
As of commit d4c7ca3 ("update c/{buildah,common,image,storage} to latest main") no dependencies use exclude_graphdriver_devicemapper tag. This (hopefully) concludes the work of removing devicemapper graph driver. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 7131cfa commit 60692ca

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system
4848
USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
4949
SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
5050
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
5252
BUILDTAGS ?= \
5353
$(shell hack/apparmor_tag.sh) \
5454
$(shell hack/btrfs_installed_tag.sh) \
5555
$(shell hack/btrfs_tag.sh) \
5656
$(shell hack/systemd_tag.sh) \
5757
$(shell hack/libsubid_tag.sh) \
58-
exclude_graphdriver_devicemapper \
5958
seccomp
6059
# allow downstreams to easily add build tags while keeping our defaults
6160
BUILDTAGS += ${EXTRA_BUILDTAGS}
@@ -86,7 +85,7 @@ endif
8685
# triggered.
8786
SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
8887

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
9089
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
9190
OCI_RUNTIME ?= ""
9291

contrib/cirrus/logformatter.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ ok 4 blah
182182
183183
<<<
184184
[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
186186
[+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
187187
[+0006s] ./hack/install_catatonit.sh
188188
[+0270s] ------------------------------
@@ -231,7 +231,7 @@ ok 4 blah
231231
[+1741s] FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped
232232
>>>
233233
[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 &#39;-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= &#39; -tags &quot; selinux systemd exclude_graphdriver_devicemapper seccomp&quot; -o test/checkseccomp/checkseccomp ./test/checkseccomp
234+
<span class="timestamp">[+0004s] </span>CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags &#39;-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= &#39; -tags &quot; selinux systemd seccomp&quot; -o test/checkseccomp/checkseccomp ./test/checkseccomp
235235
<span class="timestamp">[+0006s] </span>CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags &#39;-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= &#39; -o test/goecho/goecho ./test/goecho
236236
<span class="timestamp"> </span>./hack/install_catatonit.sh
237237
</pre>

pkg/machine/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ the same result:
2626
To focus on one specific test on windows, run `ginkgo` manually:
2727

2828
```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"
3030
$focus_file = "basic_test.go"
3131
$focus_test = "podman build contexts"
3232
./test/tools/build/ginkgo.exe `

rpm/podman.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT"
246246
# build rootlessport first
247247
%gobuild -o bin/rootlessport ./cmd/rootlessport
248248

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)"
250250

251251
# libtrust_openssl buildtag switches to using the FIPS-compatible func
252252
# `ecdsa.HashSign`.

winmake.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ function Get-Podman-Version{
287287
# Init script
288288
$target = $args[0]
289289

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"
291291

292292
switch ($target) {
293293
{$_ -in '', 'podman-remote', 'podman'} {

0 commit comments

Comments
 (0)