docker/moby: 19.03.x update

Updating the moby recipes to the match the 19.03.x updates pulled
into docker/docker-ce

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 4 insertions, 66 deletions

diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
index 2ba1d276..0936fdfb 100644
--- a/recipes-containers/docker/docker-moby.bb
+++ b/recipes-containers/docker/docker-moby.bb
@@ -34,8 +34,8 @@ DESCRIPTION = "Linux container runtime \
 #   - The common components of this recipe and docker-ce do need to be moved
 #     to a docker.inc recipe
 
-# moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+# moby commit matches the docker-engine bump on the 19.03 branch'
+SRCREV_moby = "08bc39c8f9e1ccdc5ff18f6e751105722cecc4a9"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
 SRC_URI = "\
@@ -44,7 +44,6 @@ SRC_URI = "\
         git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
         file://docker.init \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
-        file://0001-imporve-hardcoded-CC-on-cross-compile.patch \
         "
 
 require docker.inc
@@ -57,7 +56,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
@@ -119,7 +118,7 @@ do_compile() {
 do_install() {
         mkdir -p ${D}/${bindir}
         cp ${WORKDIR}/git/cli/build/docker ${D}/${bindir}/docker
-        cp ${S}/src/import/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
+        cp ${S}/src/import/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
         cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
diff --git a/recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile.patch b/recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile.patch
deleted file mode 100644
index 554d282c..00000000
--- a/recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 975b3a8e761b20e570120e8ca99b19da8012cae5 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 17 Jul 2019 17:34:04 +0800
-Subject: [PATCH] imporve hardcoded CC on cross compile
-
-Since commit applied in moby [61a3285 Support cross-compile for arm]
-it hardcoded var-CC to support cross-compile for arm
-
-Correct it with "${parameter:-word}" format, it is helpful for user
-define toolchains
-
-(Use Default Values.  If parameter is unset or null, the expansion of
-word is substituted.  Otherwise, the value of parameter is substituted.)
-
-Upstream-Status: Submitted [https://github.com/moby/moby/pull/39546]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- hack/make/.binary | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary
-index 53de674..66f4ca0 100644
---- a/src/import/hack/make/.binary
-+++ b/src/import/hack/make/.binary
-@@ -44,27 +44,27 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC
-        # must be cross-compiling!
-        case "$(go env GOOS)/$(go env GOARCH)" in
-                windows/amd64)
--                       export CC=x86_64-w64-mingw32-gcc
-+                       export CC="${CC:-x86_64-w64-mingw32-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-                linux/arm)
-                        case "${GOARM}" in
-                        5|"")
--                               export CC=arm-linux-gnueabi-gcc
-+                               export CC="${CC:-arm-linux-gnueabi-gcc}"
-                                export CGO_ENABLED=1
-                                ;;
-                        7)
--                               export CC=arm-linux-gnueabihf-gcc
-+                               export CC="${CC:-arm-linux-gnueabihf-gcc}"
-                                export CGO_ENABLED=1
-                                ;;
-                        esac
-                        ;;
-                linux/arm64)
--                       export CC=aarch64-linux-gnu-gcc
-+                       export CC="${CC:-aarch64-linux-gnu-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-                linux/amd64)
--                       export CC=x86_64-linux-gnu-gcc
-+                       export CC="${CC:-x86_64-linux-gnu-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-        esac
--- 
-2.7.4
-