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