gistfile1.diff

From f2b43790103e5b5f813a5e232fdf4956c5c8403f Mon Sep 17 00:00:00 2001
From: Vladimir Pouzanov <farcaller@google.com>
Date: Sat, 22 Feb 2014 21:02:58 +0000
Subject: [PATCH] Fix build flags on arm

---
 archive/stat_darwin.go                     | 2 +-
 execdriver/lxc/lxc_init_linux.go           | 2 +-
 execdriver/lxc/lxc_init_unsupported.go     | 2 +-
 graphdriver/aufs/mount_linux.go            | 2 +-
 graphdriver/aufs/mount_unsupported.go      | 2 +-
 graphdriver/btrfs/btrfs.go                 | 2 +-
 graphdriver/btrfs/dummy_unsupported.go     | 2 +-
 graphdriver/devmapper/attach_loopback.go   | 2 +-
 graphdriver/devmapper/deviceset.go         | 2 +-
 graphdriver/devmapper/devmapper.go         | 2 +-
 graphdriver/devmapper/devmapper_log.go     | 2 +-
 graphdriver/devmapper/devmapper_test.go    | 2 +-
 graphdriver/devmapper/devmapper_wrapper.go | 2 +-
 graphdriver/devmapper/driver.go            | 2 +-
 graphdriver/devmapper/driver_test.go       | 2 +-
 graphdriver/devmapper/ioctl.go             | 2 +-
 graphdriver/devmapper/mount.go             | 2 +-
 graphdriver/devmapper/sys.go               | 2 +-
 pkg/graphdb/conn_linux.go                  | 2 +-
 pkg/graphdb/conn_unsupported.go            | 2 +-
 pkg/mount/flags_linux.go                   | 2 +-
 pkg/mount/flags_unsupported.go             | 2 +-
 pkg/mount/mounter_linux.go                 | 2 +-
 pkg/mount/mounter_unsupported.go           | 2 +-
 pkg/netlink/netlink_linux.go               | 2 +-
 pkg/netlink/netlink_unsupported.go         | 2 +-
 reflink_copy_linux.go                      | 2 +-
 reflink_copy_unsupported.go                | 2 +-
 utils/uname_linux.go                       | 2 +-
 utils/uname_unsupported.go                 | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/archive/stat_darwin.go b/archive/stat_darwin.go
index 3220329..64031dc 100644
--- a/archive/stat_darwin.go
+++ b/archive/stat_darwin.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package archive

diff --git a/execdriver/lxc/lxc_init_linux.go b/execdriver/lxc/lxc_init_linux.go
index 7288f58..5cec00c 100644
--- a/execdriver/lxc/lxc_init_linux.go
+++ b/execdriver/lxc/lxc_init_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package lxc

diff --git a/execdriver/lxc/lxc_init_unsupported.go b/execdriver/lxc/lxc_init_unsupported.go
index d68cb91..aa7ed24 100644
--- a/execdriver/lxc/lxc_init_unsupported.go
+++ b/execdriver/lxc/lxc_init_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package lxc

diff --git a/graphdriver/aufs/mount_linux.go b/graphdriver/aufs/mount_linux.go
index 6082d9f..c63547d 100644
--- a/graphdriver/aufs/mount_linux.go
+++ b/graphdriver/aufs/mount_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package aufs

diff --git a/graphdriver/aufs/mount_unsupported.go b/graphdriver/aufs/mount_unsupported.go
index 2735624..0ce2cd9 100644
--- a/graphdriver/aufs/mount_unsupported.go
+++ b/graphdriver/aufs/mount_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package aufs

diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
index 592e058..bd24fac 100644
--- a/graphdriver/btrfs/btrfs.go
+++ b/graphdriver/btrfs/btrfs.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package btrfs

diff --git a/graphdriver/btrfs/dummy_unsupported.go b/graphdriver/btrfs/dummy_unsupported.go
index 6c44615..3dfd7e7 100644
--- a/graphdriver/btrfs/dummy_unsupported.go
+++ b/graphdriver/btrfs/dummy_unsupported.go
@@ -1,3 +1,3 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package btrfs
diff --git a/graphdriver/devmapper/attach_loopback.go b/graphdriver/devmapper/attach_loopback.go
index 2333907..25c3f59 100644
--- a/graphdriver/devmapper/attach_loopback.go
+++ b/graphdriver/devmapper/attach_loopback.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go
index 8432d92..88c46b1 100644
--- a/graphdriver/devmapper/deviceset.go
+++ b/graphdriver/devmapper/deviceset.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/devmapper.go b/graphdriver/devmapper/devmapper.go
index 7f83a09..a32c82e 100644
--- a/graphdriver/devmapper/devmapper.go
+++ b/graphdriver/devmapper/devmapper.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/devmapper_log.go b/graphdriver/devmapper/devmapper_log.go
index 18dde7c..ce2bb83 100644
--- a/graphdriver/devmapper/devmapper_log.go
+++ b/graphdriver/devmapper/devmapper_log.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/devmapper_test.go b/graphdriver/devmapper/devmapper_test.go
index 3ffa163..af2a645 100644
--- a/graphdriver/devmapper/devmapper_test.go
+++ b/graphdriver/devmapper/devmapper_test.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/devmapper_wrapper.go b/graphdriver/devmapper/devmapper_wrapper.go
index bf558af..0a138c2 100644
--- a/graphdriver/devmapper/devmapper_wrapper.go
+++ b/graphdriver/devmapper/devmapper_wrapper.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/driver.go b/graphdriver/devmapper/driver.go
index 664899c..36fb46c 100644
--- a/graphdriver/devmapper/driver.go
+++ b/graphdriver/devmapper/driver.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/driver_test.go b/graphdriver/devmapper/driver_test.go
index 785845c..ab61ce6 100644
--- a/graphdriver/devmapper/driver_test.go
+++ b/graphdriver/devmapper/driver_test.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/ioctl.go b/graphdriver/devmapper/ioctl.go
index 30bafff..ab2053e 100644
--- a/graphdriver/devmapper/ioctl.go
+++ b/graphdriver/devmapper/ioctl.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/mount.go b/graphdriver/devmapper/mount.go
index 4f19109..df4166e 100644
--- a/graphdriver/devmapper/mount.go
+++ b/graphdriver/devmapper/mount.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/graphdriver/devmapper/sys.go b/graphdriver/devmapper/sys.go
index 5a9ab4d..eb5f247 100644
--- a/graphdriver/devmapper/sys.go
+++ b/graphdriver/devmapper/sys.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux,amd64 linux,arm

 package devmapper

diff --git a/pkg/graphdb/conn_linux.go b/pkg/graphdb/conn_linux.go
index 7a1ab8c..d2ee0ff 100644
--- a/pkg/graphdb/conn_linux.go
+++ b/pkg/graphdb/conn_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package graphdb

diff --git a/pkg/graphdb/conn_unsupported.go b/pkg/graphdb/conn_unsupported.go
index c2d6025..a693356 100644
--- a/pkg/graphdb/conn_unsupported.go
+++ b/pkg/graphdb/conn_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package graphdb

diff --git a/pkg/mount/flags_linux.go b/pkg/mount/flags_linux.go
index b7124b1..ecfb158 100644
--- a/pkg/mount/flags_linux.go
+++ b/pkg/mount/flags_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package mount

diff --git a/pkg/mount/flags_unsupported.go b/pkg/mount/flags_unsupported.go
index c894efe..c927c1f 100644
--- a/pkg/mount/flags_unsupported.go
+++ b/pkg/mount/flags_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package mount

diff --git a/pkg/mount/mounter_linux.go b/pkg/mount/mounter_linux.go
index 70b7798..77e7a04 100644
--- a/pkg/mount/mounter_linux.go
+++ b/pkg/mount/mounter_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package mount

diff --git a/pkg/mount/mounter_unsupported.go b/pkg/mount/mounter_unsupported.go
index ee27b35..582f311 100644
--- a/pkg/mount/mounter_unsupported.go
+++ b/pkg/mount/mounter_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package mount

diff --git a/pkg/netlink/netlink_linux.go b/pkg/netlink/netlink_linux.go
index 0ea5b4d..6709167 100644
--- a/pkg/netlink/netlink_linux.go
+++ b/pkg/netlink/netlink_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package netlink

diff --git a/pkg/netlink/netlink_unsupported.go b/pkg/netlink/netlink_unsupported.go
index cd796b3..3fd8a5c 100644
--- a/pkg/netlink/netlink_unsupported.go
+++ b/pkg/netlink/netlink_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package netlink

diff --git a/reflink_copy_linux.go b/reflink_copy_linux.go
index 74a0cb9..921317f 100644
--- a/reflink_copy_linux.go
+++ b/reflink_copy_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package docker

diff --git a/reflink_copy_unsupported.go b/reflink_copy_unsupported.go
index 271ed01..ea38855 100644
--- a/reflink_copy_unsupported.go
+++ b/reflink_copy_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package docker

diff --git a/utils/uname_linux.go b/utils/uname_linux.go
index 2f4afb4..c7c8ce7 100644
--- a/utils/uname_linux.go
+++ b/utils/uname_linux.go
@@ -1,4 +1,4 @@
-// +build amd64
+// +build amd64,arm

 package utils

diff --git a/utils/uname_unsupported.go b/utils/uname_unsupported.go
index 57b82ec..afa0584 100644
--- a/utils/uname_unsupported.go
+++ b/utils/uname_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux !amd64 !arm

 package utils

--
1.8.5.2