docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Tianon Gravi 2014-02-01 21:40:51 -07:00
parent a446b34719
commit 6922f1be08
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -32,6 +32,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
apt-utils \ apt-utils \
aufs-tools \ aufs-tools \
automake \ automake \
btrfs-tools \
build-essential \ build-essential \
curl \ curl \
dpkg-sig \ dpkg-sig \
@ -40,7 +41,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
libapparmor-dev \ libapparmor-dev \
libcap-dev \ libcap-dev \
libsqlite3-dev \ libsqlite3-dev \
linux-libc-dev \
mercurial \ mercurial \
reprepro \ reprepro \
ruby1.9.1 \ ruby1.9.1 \

8
graphdriver/btrfs/btrfs.go
View File

@ -4,15 +4,11 @@ package btrfs
/* /*
#include <stdlib.h> #include <stdlib.h>
#include <sys/ioctl.h>
#include <linux/fs.h>
#include <errno.h>
#include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <linux/btrfs.h> #include <btrfs/ioctl.h>
*/ */
import "C" import "C"
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/graphdriver"

1
hack/PACKAGERS.md
View File

@ -39,6 +39,7 @@ To build docker, you will need the following system dependencies
* Go version 1.2 or later * Go version 1.2 or later
* SQLite version 3.7.9 or later * SQLite version 3.7.9 or later
* libdevmapper version 1.02.68-cvs (2012-01-26) or later from lvm2 version 2.02.89 or later * libdevmapper version 1.02.68-cvs (2012-01-26) or later from lvm2 version 2.02.89 or later
* btrfs-progs version 3.8 or later (including commit e5cb128 from 2013-01-07) for the necessary btrfs headers
* A clean checkout of the source must be added to a valid Go [workspace](http://golang.org/doc/code.html#Workspaces) * A clean checkout of the source must be added to a valid Go [workspace](http://golang.org/doc/code.html#Workspaces)
under the path *src/github.com/dotcloud/docker*. under the path *src/github.com/dotcloud/docker*.