github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-18 16:51:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2581 from mtrmac/btrfs_noversion

Browse Source 
Stop setting unused build tags
This commit is contained in:
Miloslav Trmač 2025-04-17 17:11:30 +02:00 committed by GitHub
commit ee84e9ae0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -62,7 +62,7 @@ doccheck_task:
cpu: 4 cpu: 4
memory: 8 memory: 8
env: env:
BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' BUILDTAGS: &withopengpg 'containers_image_openpgp'
script: | script: |
# TODO: Can't use 'runner.sh setup' inside container. However, # TODO: Can't use 'runner.sh setup' inside container. However,
# removing the pre-installed package is the only necessary step # removing the pre-installed package is the only necessary step
@ -194,7 +194,7 @@ test_skopeo_task:
matrix: matrix:
- name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh - name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh
env: env:
BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' BUILDTAGS: ''
- name: "Skopeo Test w/ opengpg" - name: "Skopeo Test w/ opengpg"
env: env:
BUILDTAGS: *withopengpg BUILDTAGS: *withopengpg

2
Makefile
View File

@ -90,7 +90,7 @@ SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} $(EXTRA_LDFLAGS)'
MANPAGES_MD = $(wildcard docs/*.md) MANPAGES_MD = $(wildcard docs/*.md)
MANPAGES ?= $(MANPAGES_MD:%.md=%) MANPAGES ?= $(MANPAGES_MD:%.md=%)
BTRFS_BUILD_TAG = $(shell hack/btrfs_tag.sh) $(shell hack/btrfs_installed_tag.sh) BTRFS_BUILD_TAG = $(shell hack/btrfs_installed_tag.sh)
LIBSUBID_BUILD_TAG = $(shell hack/libsubid_tag.sh) LIBSUBID_BUILD_TAG = $(shell hack/libsubid_tag.sh)
LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBSUBID_BUILD_TAG) LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBSUBID_BUILD_TAG)
BUILDTAGS += $(LOCAL_BUILD_TAGS) BUILDTAGS += $(LOCAL_BUILD_TAGS)

2
contrib/cirrus/runner.sh
View File

@ -128,7 +128,7 @@ _run_system() {
make test-system-local BUILDTAGS="$BUILDTAGS" make test-system-local BUILDTAGS="$BUILDTAGS"
} }
req_env_vars SKOPEO_PATH BUILDTAGS req_env_vars SKOPEO_PATH
handler="_run_${1}" handler="_run_${1}"
if [ "$(type -t $handler)" != "function" ]; then if [ "$(type -t $handler)" != "function" ]; then

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

4
rpm/skopeo.spec
View File

@ -120,9 +120,9 @@ export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection=full"
BASEBUILDTAGS="$(hack/libsubid_tag.sh)" BASEBUILDTAGS="$(hack/libsubid_tag.sh)"
%if %{defined build_with_btrfs} %if %{defined build_with_btrfs}
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_tag.sh) $(hack/btrfs_installed_tag.sh)" export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
%else %else
export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs" export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs"
%endif %endif
%if %{defined fips} %if %{defined fips}