beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: Remove btrfs_noversion build flag

Browse source 
btrfs_noversion was added in d7c37b5a28
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 e665263b10)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Eli Uriegas 2019-08-06 22:28:24 +00:00 committed by Sebastiaan van Stijn
parent 9077436e6e
commit b1798d895a
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
4 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/graphdriver/btrfs/version.go
View file

@ -1,4 +1,4 @@
// +build linux,!btrfs_noversion
// +build linux
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

14
daemon/graphdriver/btrfs/version_none.go
View file

@ -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
}

2
daemon/graphdriver/btrfs/version_test.go
View file

@ -1,4 +1,4 @@
// +build linux,!btrfs_noversion
// +build linux
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

8
hack/make.sh
View file

@ -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 <btrfs/version.h>' \
; 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