1 files changed, 23 insertions, 8 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 37df3c4c..d163b137 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -66,14 +66,29 @@ DOCKER_PKG="github.com/docker/docker"
 do_configure[noexec] = "1"
 do_compile() {
-        export GOARCH="${TARGET_ARCH}"
+        case "${TARGET_ARCH}" in
-        # supported amd64, 386, arm arm64
+                arm)
-        if [ "${TARGET_ARCH}" = "x86_64" ]; then
+                        GOARCH=arm
-                export GOARCH="amd64"
+                        case "${TUNE_PKGARCH}" in
-        fi
+                                cortexa*)
-        if [ "${TARGET_ARCH}" = "aarch64" ]; then
+                                        export GOARM=7
-                export GOARCH="arm64"
+                                ;;
-        fi
+                        esac
+                ;;
+                aarch64)
+                        GOARCH=arm64
+                ;;
+                i586|i686)
+                        GOARCH=386
+                ;;
+                x86_64)
+                        GOARCH=amd64
+                ;;
+                *)
+                        GOARCH="${TARGET_ARCH}"
+                ;;
+        esac
+        export GOARCH
        # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
        # docker to download its dependencies but rather

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 37df3c4c..d163b137 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb
@@ -66,14 +66,29 @@ DOCKER_PKG="github.com/docker/docker"
66	do_configure[noexec] = "1"	66	do_configure[noexec] = "1"
67		67
68	do_compile() {	68	do_compile() {
69	export GOARCH="${TARGET_ARCH}"	69	case "${TARGET_ARCH}" in
70	# supported amd64, 386, arm arm64	70	arm)
71	if [ "${TARGET_ARCH}" = "x86_64" ]; then	71	GOARCH=arm
72	export GOARCH="amd64"	72	case "${TUNE_PKGARCH}" in
73	fi	73	cortexa*)
74	if [ "${TARGET_ARCH}" = "aarch64" ]; then	74	export GOARM=7
75	export GOARCH="arm64"	75	;;
76	fi	76	esac
		77	;;
		78	aarch64)
		79	GOARCH=arm64
		80	;;
		81	i586\|i686)
		82	GOARCH=386
		83	;;
		84	x86_64)
		85	GOARCH=amd64
		86	;;
		87	*)
		88	GOARCH="${TARGET_ARCH}"
		89	;;
		90	esac
		91	export GOARCH
77		92
78	# Set GOPATH. See 'PACKAGERS.md'. Don't rely on	93	# Set GOPATH. See 'PACKAGERS.md'. Don't rely on
79	# docker to download its dependencies but rather	94	# docker to download its dependencies but rather