From 0c874e0bb898b0d709873fac47766f6feb52369a Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Tue, 28 Nov 2023 13:59:22 +0000 Subject: [PATCH] chore: drop containers/image related build tags Now we don't use containers/image (except for types for backward compatibility through to 5.0), remove the build tags related to containers/image and containers/storage that are no longer required. --- .golangci.yml | 1 - .vscode/settings.json | 4 ++-- mlocal/frags/go_common_opts.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fb57a03769..45142e3df5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,6 @@ run: timeout: 5m build-tags: - apparmor - - containers_image_openpgp - e2e_test - fakeroot_engine - seccomp diff --git a/.vscode/settings.json b/.vscode/settings.json index 543ff956a8..5f2031dcd7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,7 @@ "--fast" ], "go.buildFlags": [ - "-tags=apparmor,containers_image_openpgp,fakeroot_engine,seccomp,selinux,singularity_engine,sylog" + "-tags=apparmor,fakeroot_engine,seccomp,selinux,singularity_engine,sylog" ], - "go.testTags": "apparmor,containers_image_openpgp,fakeroot_engine,seccomp,selinux,singularity_engine,sylog,e2e_test,integration_test" + "go.testTags": "apparmor,fakeroot_engine,seccomp,selinux,singularity_engine,sylog,e2e_test,integration_test" } diff --git a/mlocal/frags/go_common_opts.mk b/mlocal/frags/go_common_opts.mk index e3d0cb6d4f..b6206046a5 100644 --- a/mlocal/frags/go_common_opts.mk +++ b/mlocal/frags/go_common_opts.mk @@ -1,7 +1,7 @@ # go tool default build options GO111MODULE := on -GO_TAGS := containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper sylog singularity_engine fakeroot_engine -GO_TAGS_SUID := containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper sylog singularity_engine fakeroot_engine +GO_TAGS := sylog singularity_engine fakeroot_engine +GO_TAGS_SUID := sylog singularity_engine fakeroot_engine GO_LDFLAGS := # Need to use non-pie build on ppc64le # https://github.com/hpcng/singularity/issues/5762