From b1798d895a91ecb18d3417e7fc895d97d2a32eea Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 6 Aug 2019 22:28:24 +0000 Subject: [PATCH] daemon: Remove btrfs_noversion build flag btrfs_noversion was added in d7c37b5a28de6e7c0a9270815c092a45d8d7fef7 for distributions that did not have the `btrfs/version.h` header file. Seeing how all of the distributions we currently support do have the `btrfs/version.h` file we should probably just remove this build flag altogether. Signed-off-by: Eli Uriegas (cherry picked from commit e665263b102398835f0bbd17f511760680574131) Signed-off-by: Sebastiaan van Stijn --- daemon/graphdriver/btrfs/version.go | 2 +- daemon/graphdriver/btrfs/version_none.go | 14 -------------- daemon/graphdriver/btrfs/version_test.go | 2 +- hack/make.sh | 8 -------- 4 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 daemon/graphdriver/btrfs/version_none.go diff --git a/daemon/graphdriver/btrfs/version.go b/daemon/graphdriver/btrfs/version.go index 2fb5c73555..f6db8e64c7 100644 --- a/daemon/graphdriver/btrfs/version.go +++ b/daemon/graphdriver/btrfs/version.go @@ -1,4 +1,4 @@ -// +build linux,!btrfs_noversion +// +build linux package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" diff --git a/daemon/graphdriver/btrfs/version_none.go b/daemon/graphdriver/btrfs/version_none.go deleted file mode 100644 index 5c755f8177..0000000000 --- a/daemon/graphdriver/btrfs/version_none.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build linux,btrfs_noversion - -package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" - -// TODO(vbatts) remove this work-around once supported linux distros are on -// btrfs utilities of >= 3.16.1 - -func btrfsBuildVersion() string { - return "-" -} - -func btrfsLibVersion() int { - return -1 -} diff --git a/daemon/graphdriver/btrfs/version_test.go b/daemon/graphdriver/btrfs/version_test.go index 465daadb0d..7c373ecea7 100644 --- a/daemon/graphdriver/btrfs/version_test.go +++ b/daemon/graphdriver/btrfs/version_test.go @@ -1,4 +1,4 @@ -// +build linux,!btrfs_noversion +// +build linux package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" diff --git a/hack/make.sh b/hack/make.sh index f019e910f9..1bd37b02cd 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -91,14 +91,6 @@ elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then DOCKER_BUILDTAGS+=" journald journald_compat" fi -# test whether "btrfs/version.h" exists and apply btrfs_noversion appropriately -if \ - command -v gcc &> /dev/null \ - && ! gcc -E - -o /dev/null &> /dev/null <<<'#include ' \ -; then - DOCKER_BUILDTAGS+=' btrfs_noversion' -fi - # test whether "libdevmapper.h" is new enough to support deferred remove # functionality. We favour libdm_dlsym_deferred_remove over # libdm_no_deferred_remove in dynamic cases because the binary could be shipped