From f31466e7479344d9968f6d679d9c2ef5cb45a360 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 13 Jun 2023 16:43:13 +0200 Subject: [PATCH] Revert "rootlessport: exclude storage drivers via build tags" This reverts commit ebf7474747787827b1fdc09ac58e949f1ace2d67. With the c/storage change[1] we no longer need this workaround. [1] https://github.com/containers/storage/pull/1637 Signed-off-by: Paul Holzinger --- Makefile | 2 -- rpm/podman.spec | 1 - 2 files changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 3302edc59f..0634d0cf68 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,6 @@ BUILDTAGS ?= \ $(shell hack/libsubid_tag.sh) \ exclude_graphdriver_devicemapper \ seccomp -ROOTLESSPORTTAGS ?= exclude_graphdriver_aufs exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay exclude_graphdriver_zfs PYTHON ?= $(shell command -v python3 python|head -n1) PKG_MANAGER ?= $(shell command -v dnf yum|head -n1) # ~/.local/bin is not in PATH on all systems @@ -404,7 +403,6 @@ bin/rootlessport: $(SOURCES) go.mod go.sum CGO_ENABLED=$(CGO_ENABLED) \ $(GO) build \ $(BUILDFLAGS) \ - -tags "$(ROOTLESSPORTTAGS)" \ -o $@ ./cmd/rootlessport .PHONY: rootlessport diff --git a/rpm/podman.spec b/rpm/podman.spec index 3250f845e7..042fd29152 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -277,7 +277,6 @@ ln -s vendor src LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" # build rootlessport first -export BUILDTAGS="exclude_graphdriver_aufs exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay exclude_graphdriver_zfs" %gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"