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

Merge pull request #39681 from seemethere/only_add_btrfs_when_needed_please

Browse source 
Remove btrfs_noversion build tag, no longer needed
This commit is contained in:
Sebastiaan van Stijn 2019-08-07 10:19:56 +02:00 committed by GitHub
commit 3a4b51ebb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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" 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" package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

8
hack/make.sh
View file

@ -115,14 +115,6 @@ elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
DOCKER_BUILDTAGS+=" journald journald_compat" DOCKER_BUILDTAGS+=" journald journald_compat"
fi 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 # test whether "libdevmapper.h" is new enough to support deferred remove
# functionality. We favour libdm_dlsym_deferred_remove over # functionality. We favour libdm_dlsym_deferred_remove over
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped # libdm_no_deferred_remove in dynamic cases because the binary could be shipped