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

Commit 04be8ea

Browse files
seemetherethaJeztah
authored andcommitted
daemon: Remove btrfs_noversion build flag
btrfs_noversion was added in d7c37b5 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 <eli.uriegas@docker.com> (cherry picked from commit e665263b102398835f0bbd17f511760680574131) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: b1798d895a91ecb18d3417e7fc895d97d2a32eea Component: engine
1 parent a62d4a6 commit 04be8ea

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)