Browse code
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 <eli.uriegas@docker.com>
(cherry picked from commit e665263b102398835f0bbd17f511760680574131)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Eli Uriegas authored on 2019/08/07 07:28:24Showing 4 changed files
- daemon/graphdriver/btrfs/version.go
- daemon/graphdriver/btrfs/version_none.go
- daemon/graphdriver/btrfs/version_test.go
- hack/make.sh
| 5 | 5 |
deleted file mode 100644 |
| ... | ... |
@@ -1,14 +0,0 @@ |
| 1 |
-// +build linux,btrfs_noversion |
|
| 2 |
- |
|
| 3 |
-package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" |
|
| 4 |
- |
|
| 5 |
-// TODO(vbatts) remove this work-around once supported linux distros are on |
|
| 6 |
-// btrfs utilities of >= 3.16.1 |
|
| 7 |
- |
|
| 8 |
-func btrfsBuildVersion() string {
|
|
| 9 |
- return "-" |
|
| 10 |
-} |
|
| 11 |
- |
|
| 12 |
-func btrfsLibVersion() int {
|
|
| 13 |
- return -1 |
|
| 14 |
-} |
| ... | ... |
@@ -91,14 +91,6 @@ elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
|
| 91 | 91 |
DOCKER_BUILDTAGS+=" journald journald_compat" |
| 92 | 92 |
fi |
| 93 | 93 |
|
| 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 |
- |
|
| 102 | 94 |
# test whether "libdevmapper.h" is new enough to support deferred remove |
| 103 | 95 |
# functionality. We favour libdm_dlsym_deferred_remove over |
| 104 | 96 |
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped |