From de015f796bf995d36d1a53aad4bb5079111ad965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Sun, 17 Jun 2018 17:01:38 +0300
Subject: [PATCH] containerd build OK

---
 hardware/virtualization/containerd/actions.py | 13 ++++++++-----
 hardware/virtualization/containerd/pspec.xml  |  5 ++++-
 hardware/virtualization/docker/actions.py     |  4 ----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hardware/virtualization/containerd/actions.py b/hardware/virtualization/containerd/actions.py
index 7ddafa5903..b603cdd1c4 100644
--- a/hardware/virtualization/containerd/actions.py
+++ b/hardware/virtualization/containerd/actions.py
@@ -16,12 +16,15 @@ def build():
     shelltools.cd("%s" % get.workDIR())
     shelltools.move("containerd-*", "containerd")
     
-    shelltools.makedirs("src/github.com/docker")
-    shelltools.system("ln -rsf containerd*  src/github.com/docker")
-
-    shelltools.cd("src/github.com/docker/containerd")
+    shelltools.cd("containerd")
+    shelltools.move("vendor", "src")
     
-    shelltools.system("LDFLAGS= make")
+    shelltools.makedirs("src/github.com/containerd")
+    shelltools.system("ln -rsf %s/containerd*  src/github.com/containerd" % get.workDIR())
+
+    shelltools.cd("src/github.com/containerd/containerd")
+    
+    shelltools.system("LDFLAGS= GOPATH=%s make GIT_COMMIT=209a7fc" % get.curDIR())
 
 def install():
     shelltools.cd("%s/containerd" % get.workDIR())
diff --git a/hardware/virtualization/containerd/pspec.xml b/hardware/virtualization/containerd/pspec.xml
index 3e96472b78..4126bb6230 100644
--- a/hardware/virtualization/containerd/pspec.xml
+++ b/hardware/virtualization/containerd/pspec.xml
@@ -15,6 +15,8 @@
         <BuildDependencies>
             <Dependency>golang</Dependency>
             <Dependency>git</Dependency>
+            <Dependency>libseccomp-devel</Dependency>
+            <Dependency>btrfs-progs-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -22,6 +24,7 @@
         <Name>containerd</Name>
         <RuntimeDependencies>
             <Dependency>runc</Dependency>
+            <Dependency>libseccomp</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -31,7 +34,7 @@
 
     <History>
         <Update release="3">
-            <Date>2018-06-10</Date>
+            <Date>2018-06-17</Date>
             <Version>1.1.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Ertuğrul Erata</Name>
diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index e2b9d48229..e692925543 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -19,7 +19,6 @@ shelltools.export("GOPATH", "%s" % get.workDIR())
 shelltools.export("CGO_CFLAGS", "-I/usr/include")
 shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
 shelltools.export("DOCKER_BUILDTAGS","seccomp")
-shelltools.export("GOWORK","src/github.com/docker")
   
 NoStrip=["/"]
 
@@ -28,7 +27,6 @@ def setup():
     shelltools.cd("components/cli/src/github.com/docker")
     shelltools.system("ln -s ../../../../cli . ")
 
-
 def build():
     shelltools.cd("%s" % get.workDIR())
     shelltools.cd("docker-ce-%s-ce/components/engine" % get.srcVERSION())
@@ -53,6 +51,4 @@ def install():
     
     pisitools.dobin("components/engine/contrib/check-config.sh")
 
-
     pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md", "CHANGELOG.md")
-