From 020e12221424d2f73546ed3cd28e3a523bcb89f8 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 3 Mar 2025 17:17:39 -0800 Subject: [PATCH] Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper It is not needed since commit 34145bbe ("Bump c/image to v5.31.0, c/storage v1.54.0"), which removes device mapper support. Signed-off-by: Kir Kolyshkin --- common/.golangci-extra.yml | 1 - common/.golangci.yml | 1 - common/Makefile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/.golangci-extra.yml b/common/.golangci-extra.yml index 67c7cc1cbb..bccd162b31 100644 --- a/common/.golangci-extra.yml +++ b/common/.golangci-extra.yml @@ -13,7 +13,6 @@ run: - selinux - systemd - exclude_graphdriver_btrfs - - exclude_graphdriver_devicemapper - containers_image_openpgp concurrency: 6 deadline: 5m diff --git a/common/.golangci.yml b/common/.golangci.yml index 4bbdef6b54..1bec377771 100644 --- a/common/.golangci.yml +++ b/common/.golangci.yml @@ -6,7 +6,6 @@ run: - selinux - systemd - exclude_graphdriver_btrfs - - exclude_graphdriver_devicemapper - containers_image_openpgp - cni timeout: 5m diff --git a/common/Makefile b/common/Makefile index 20f324c94d..7884489bb0 100644 --- a/common/Makefile +++ b/common/Makefile @@ -2,7 +2,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go GO_BUILD=$(GO) build -BUILDTAGS := containers_image_openpgp,systemd,exclude_graphdriver_devicemapper +BUILDTAGS := containers_image_openpgp,systemd DESTDIR ?= PREFIX := /usr/local CONFIGDIR := ${PREFIX}/share/containers