Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit ebff06c

Browse files
authored
Merge pull request #445 from thaJeztah/19.03_backport_only_add_btrfs_when_needed_please
[19.03 backport] Remove btrfs_noversion build tag, no longer needed Upstream-commit: 1984d8064b629b8150c2eacee49f20db66579eed Component: engine
2 parents a62d4a6 + 04be8ea commit ebff06c

4 files changed

Lines changed: 2 additions & 24 deletions

File tree

components/engine/daemon/graphdriver/btrfs/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build linux,!btrfs_noversion
1+
// +build linux
22

33
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
44

components/engine/daemon/graphdriver/btrfs/version_none.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

components/engine/daemon/graphdriver/btrfs/version_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build linux,!btrfs_noversion
1+
// +build linux
22

33
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
44

components/engine/hack/make.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
9191
DOCKER_BUILDTAGS+=" journald journald_compat"
9292
fi
9393

94-
# test whether "btrfs/version.h" exists and apply btrfs_noversion appropriately
95-
if \
96-
command -v gcc &> /dev/null \
97-
&& ! gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
98-
; then
99-
DOCKER_BUILDTAGS+=' btrfs_noversion'
100-
fi
101-
10294
# test whether "libdevmapper.h" is new enough to support deferred remove
10395
# functionality. We favour libdm_dlsym_deferred_remove over
10496
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped

0 commit comments

Comments
 (0)