diff options
| author | Vincent Batts <vbatts@hashbangbash.com> | 2014-01-30 13:13:54 -0600 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2014-02-08 11:09:51 -0600 |
| commit | f1e2b846410cb6fc34da5f3ce4b85dc035810eb3 (patch) | |
| tree | 8ba3233a0e734b21498d7f967e4e82afdf557c6a /system/docker/docker-btrfs.patch | |
| parent | 3059f8abc4dcd52c9b2c3f702505b51b83517ab5 (diff) | |
| download | slackbuilds-f1e2b846410cb6fc34da5f3ce4b85dc035810eb3.tar.xz | |
system/docker: Added (manager for applications in linux containers)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/docker/docker-btrfs.patch')
| -rw-r--r-- | system/docker/docker-btrfs.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/system/docker/docker-btrfs.patch b/system/docker/docker-btrfs.patch new file mode 100644 index 000000000000..ef6c54088103 --- /dev/null +++ b/system/docker/docker-btrfs.patch @@ -0,0 +1,32 @@ +commit 6922f1be08111d889b0585b763b08f92d7a55e05 +Author: Tianon Gravi <admwiggin@gmail.com> +Date: Sat Feb 1 21:40:51 2014 -0700 + + Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs) + + This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers). + + Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon) + +diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go +index a50f11f..3d27909 100644 +--- a/graphdriver/btrfs/btrfs.go ++++ b/graphdriver/btrfs/btrfs.go +@@ -4,15 +4,11 @@ package btrfs + + /* + #include <stdlib.h> +-#include <sys/ioctl.h> +-#include <linux/fs.h> +-#include <errno.h> +-#include <sys/types.h> + #include <dirent.h> +-#include <linux/btrfs.h> +- ++#include <btrfs/ioctl.h> + */ + import "C" ++ + import ( + "fmt" + "github.com/dotcloud/docker/graphdriver" |