docker uprev 1.6.2

Uprev docker to 1.6.2

go-capability is upreved to a later git commit
go-dbus is upreved to version 2
go-distribution-digest is added as a new dependency. Only the
   digest part of go-distribution is needed/kept here,
   hence go-distribution-digest
go-logrus is upreved to 0.7.1

Remove PR since it's no longer used

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 10 insertions, 9 deletions

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index cb546161..8bcaee9b 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,9 +18,9 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV = "2243e32cbbf1c9809c262a7376d34ca43a7a36dc"
+SRCREV = "7c8fca2ddb58c8d2c4fb4df31c242886df7dd257"
 SRC_URI = "\
-        git://github.com/docker/docker.git \
+        git://github.com/docker/docker.git;branch=release \
         file://docker.service \
         file://docker.init \
         file://hi.Dockerfile \
@@ -38,7 +38,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1cc0497778922bfd6cb48721deb80dc7"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "1.5.0"
+DOCKER_VERSION = "1.6.2"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
 DEPENDS = "golang-cross \
@@ -57,6 +57,7 @@ DEPENDS = "golang-cross \
     go-systemd \
     btrfs-tools \
     sqlite3 \
+    go-distribution-digest \
     "
 
 DEPENDS_append_class-target = "lvm2"
@@ -110,9 +111,9 @@ INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
 do_install() {
         mkdir -p ${D}/${bindir}
-        cp ${S}/bundles/${DOCKER_VERSION}-dev/dynbinary/docker-${DOCKER_VERSION}-dev \
+        cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} \
           ${D}/${bindir}/docker
-        cp ${S}/bundles/${DOCKER_VERSION}-dev/dynbinary/dockerinit-${DOCKER_VERSION}-dev \
+        cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/dockerinit-${DOCKER_VERSION} \
           ${D}/${bindir}/dockerinit
 
         if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
diff --git a/recipes-containers/docker/files/disable_sha1sum_startup.patch b/recipes-containers/docker/files/disable_sha1sum_startup.patch
index cc6819bd..580ca23a 100644
--- a/recipes-containers/docker/files/disable_sha1sum_startup.patch
+++ b/recipes-containers/docker/files/disable_sha1sum_startup.patch
@@ -17,15 +17,15 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com>
 
 --- a/utils/utils.go
 +++ b/utils/utils.go
-@@ -4,7 +4,6 @@
+@@ -3,7 +3,6 @@
+ import (
         "bufio"
         "bytes"
-        "crypto/rand"
 -       "crypto/sha1"
         "crypto/sha256"
         "encoding/hex"
         "fmt"
-@@ -76,20 +75,6 @@
+@@ -75,20 +74,6 @@
         return path
  }
  
@@ -46,7 +46,7 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com>
  func isValidDockerInitPath(target string, selfPath string) bool { // target and selfPath should be absolute (InitPath and SelfPath already do this)
         if target == "" {
                 return false
-@@ -111,7 +96,7 @@
+@@ -110,7 +95,7 @@
                 }
                 return os.SameFile(targetFileInfo, selfPathFileInfo)
         }