opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-24 01:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop setting btrfs_noversion build tag

Browse Source 
c/storage no longer uses this tag after
https://github.com/containers/storage/pull/2308.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-04-30 14:22:25 +02:00
parent dd8fbb7582
commit c9b1bd1cf3
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -57,11 +57,10 @@ 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 containers_image_openpgp REMOTETAGS ?= remote exclude_graphdriver_btrfs 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/systemd_tag.sh) \ $(shell hack/systemd_tag.sh) \
$(shell hack/libsubid_tag.sh) \ $(shell hack/libsubid_tag.sh) \
$(if $(filter linux,$(GOOS)), seccomp,) $(if $(filter linux,$(GOOS)), seccomp,)

7
hack/btrfs_tag.sh
View File

@ -1,7 +0,0 @@
#!/usr/bin/env bash
${CPP:-${CC:-cc} -E} ${CPPFLAGS} - > /dev/null 2> /dev/null << EOF
#include <btrfs/version.h>
EOF
if test $? -ne 0 ; then
echo btrfs_noversion
fi

2
pkg/machine/e2e/README.md
View File

@ -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 containers_image_openpgp" $remotetags = "remote exclude_graphdriver_btrfs 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 `

8
rpm/podman.spec
View File

@ -258,19 +258,19 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl"
%endif %endif
# build %%{name} # build %%{name}
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/libdm_tag.sh)"
%gobuild -o bin/%{name} ./cmd/%{name} %gobuild -o bin/%{name} ./cmd/%{name}
# build %%{name}-remote # build %%{name}-remote
export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote" export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs remote"
%gobuild -o bin/%{name}-remote ./cmd/%{name} %gobuild -o bin/%{name}-remote ./cmd/%{name}
# build quadlet # build quadlet
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
%gobuild -o bin/quadlet ./cmd/quadlet %gobuild -o bin/quadlet ./cmd/quadlet
# build %%{name}-testing # build %%{name}-testing
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
%gobuild -o bin/podman-testing ./cmd/podman-testing %gobuild -o bin/podman-testing ./cmd/podman-testing
# reset LDFLAGS for plugins binaries # reset LDFLAGS for plugins binaries

2
winmake.ps1
View File

@ -288,7 +288,7 @@ function Get-Podman-Version{
# Init script # Init script
$target = $args[0] $target = $args[0]
$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp" $remotetags = "remote exclude_graphdriver_btrfs containers_image_openpgp"
switch ($target) { switch ($target) {
{$_ -in '', 'podman-remote', 'podman'} { {$_ -in '', 'podman-remote', 'podman'} {