commit 831eb091b7cecd969bc02c1fb6a47f8c53a2a4a5 Author: Lokesh Mandvekar lsm5@redhat.com Date: Mon Apr 14 12:29:53 2014 -0400
update commit value, regenerate epel btrfs removal patch
docker-io.spec | 8 +++++- ignore-btrfs-for-rhel.patch | 45 ++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 28 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 400fb64..cd576f9 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -9,12 +9,12 @@ %global debug_package %{nil} %global gopath %{_datadir}/gocode
-%global commit 867b2a90c228f62cdcd44907ceef279a2d8f1ac5 +%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659 %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0
@@ -197,6 +197,10 @@ fi %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog +* Mon Apr 14 2014 Lokesh Mandvekar lsm5@redhat.com - 0.10.0-2 +- regenerate btrfs removal patch +- update commit value + * Mon Apr 14 2014 Lokesh Mandvekar lsm5@redhat.com - 0.10.0-1 - include manpages from contrib
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch index ca3bc79..5a14235 100644 --- a/ignore-btrfs-for-rhel.patch +++ b/ignore-btrfs-for-rhel.patch @@ -1,8 +1,6 @@ -diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go -deleted file mode 100644 -index 592e058..0000000 ---- a/graphdriver/btrfs/btrfs.go -+++ /dev/null +diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go +--- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400 ++++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500 @@ -1,213 +0,0 @@ -// +build linux,amd64 - @@ -17,7 +15,7 @@ index 592e058..0000000 - -import ( - "fmt" -- "github.com/dotcloud/docker/graphdriver" +- "github.com/dotcloud/docker/runtime/graphdriver" - "os" - "path" - "syscall" @@ -86,7 +84,7 @@ index 592e058..0000000 - return uintptr(C.dirfd(dir)) -} - --func subvolCreate(path, name string) error { +-func subvolCreate(path, name string, mountLabel string) error { - dir, err := openDir(path) - if err != nil { - return err @@ -161,13 +159,13 @@ index 592e058..0000000 - return path.Join(d.subvolumesDir(), id) -} - --func (d *Driver) Create(id string, parent string) error { +-func (d *Driver) Create(id string, parent string, mountLabel string) error { - subvolumes := path.Join(d.home, "subvolumes") - if err := os.MkdirAll(subvolumes, 0700); err != nil { - return err - } - if parent == "" { -- if err := subvolCreate(subvolumes, id); err != nil { +- if err := subvolCreate(subvolumes, id, mountLabel); err != nil { - return err - } - } else { @@ -217,24 +215,19 @@ index 592e058..0000000 - _, err := os.Stat(dir) - return err == nil -} -diff --git a/graphdriver/btrfs/dummy_unsupported.go b/graphdriver/btrfs/dummy_unsupported.go -deleted file mode 100644 -index 6c44615..0000000 ---- a/graphdriver/btrfs/dummy_unsupported.go -+++ /dev/null +diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go +--- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400 ++++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500 @@ -1,3 +0,0 @@ -// +build !linux !amd64 - -package btrfs -diff --git a/runtime.go b/runtime.go -index 84f11e8..41fdccd 100644 ---- a/runtime.go -+++ b/runtime.go -@@ -11,7 +11,6 @@ import ( - "github.com/dotcloud/docker/execdriver/native" - "github.com/dotcloud/docker/graphdriver" - "github.com/dotcloud/docker/graphdriver/aufs" -- _ "github.com/dotcloud/docker/graphdriver/btrfs" - _ "github.com/dotcloud/docker/graphdriver/devmapper" - _ "github.com/dotcloud/docker/graphdriver/vfs" - _ "github.com/dotcloud/docker/networkdriver/lxc" +diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go +--- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400 ++++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400 +@@ -3,5 +3,4 @@ + package runtime + + import ( +- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs" + )