mirror of
https://github.com/containers/podman.git
synced 2025-07-02 08:47:43 +08:00
Merge pull request #25727 from kolyshkin/bye-dm
Remove exclude_graphdriver_devicemapper build tag
This commit is contained in:
5
Makefile
5
Makefile
@ -48,14 +48,13 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system
|
|||||||
USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
|
USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
|
||||||
SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
|
SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
|
||||||
USERSYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/user-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 ?= \
|
BUILDTAGS ?= \
|
||||||
$(shell hack/apparmor_tag.sh) \
|
$(shell hack/apparmor_tag.sh) \
|
||||||
$(shell hack/btrfs_installed_tag.sh) \
|
$(shell hack/btrfs_installed_tag.sh) \
|
||||||
$(shell hack/btrfs_tag.sh) \
|
$(shell hack/btrfs_tag.sh) \
|
||||||
$(shell hack/systemd_tag.sh) \
|
$(shell hack/systemd_tag.sh) \
|
||||||
$(shell hack/libsubid_tag.sh) \
|
$(shell hack/libsubid_tag.sh) \
|
||||||
exclude_graphdriver_devicemapper \
|
|
||||||
seccomp
|
seccomp
|
||||||
# allow downstreams to easily add build tags while keeping our defaults
|
# allow downstreams to easily add build tags while keeping our defaults
|
||||||
BUILDTAGS += ${EXTRA_BUILDTAGS}
|
BUILDTAGS += ${EXTRA_BUILDTAGS}
|
||||||
@ -86,7 +85,7 @@ endif
|
|||||||
# triggered.
|
# triggered.
|
||||||
SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
|
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)
|
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
|
||||||
OCI_RUNTIME ?= ""
|
OCI_RUNTIME ?= ""
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ ok 4 blah
|
|||||||
|
|
||||||
<<<
|
<<<
|
||||||
[05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08.
|
[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] 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
|
[+0006s] ./hack/install_catatonit.sh
|
||||||
[+0270s] ------------------------------
|
[+0270s] ------------------------------
|
||||||
@ -231,7 +231,7 @@ ok 4 blah
|
|||||||
[+1741s] FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped
|
[+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.
|
[05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08.
|
||||||
<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
|
<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
|
||||||
<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
|
<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
|
||||||
<span class="timestamp"> </span>./hack/install_catatonit.sh
|
<span class="timestamp"> </span>./hack/install_catatonit.sh
|
||||||
</pre>
|
</pre>
|
||||||
|
@ -26,7 +26,7 @@ the same result:
|
|||||||
To focus on one specific test on windows, run `ginkgo` manually:
|
To focus on one specific test on windows, run `ginkgo` manually:
|
||||||
|
|
||||||
```pwsh
|
```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_file = "basic_test.go"
|
||||||
$focus_test = "podman build contexts"
|
$focus_test = "podman build contexts"
|
||||||
./test/tools/build/ginkgo.exe `
|
./test/tools/build/ginkgo.exe `
|
||||||
|
@ -246,7 +246,7 @@ LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT"
|
|||||||
# build rootlessport first
|
# build rootlessport first
|
||||||
%gobuild -o bin/rootlessport ./cmd/rootlessport
|
%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
|
# libtrust_openssl buildtag switches to using the FIPS-compatible func
|
||||||
# `ecdsa.HashSign`.
|
# `ecdsa.HashSign`.
|
||||||
|
@ -287,7 +287,7 @@ function Get-Podman-Version{
|
|||||||
# Init script
|
# Init script
|
||||||
$target = $args[0]
|
$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) {
|
switch ($target) {
|
||||||
{$_ -in '', 'podman-remote', 'podman'} {
|
{$_ -in '', 'podman-remote', 'podman'} {
|
||||||
|
Reference in New Issue
Block a user