All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/4] docker: update to docker 1.12.5 release
@ 2016-12-20  9:25 Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 2/4] docker: update description Fathi Boudra
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Fathi Boudra @ 2016-12-20  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: bruce.ashfield, koen.kooi

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 recipes-containers/docker/docker_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 2cff6f1..f50f25a 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV = "34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b"
+SRCREV = "7392c3b0ce0f9d3e918a321c66668c5d1ef4f689"
 SRC_URI = "\
 	git://github.com/docker/docker.git;nobranch=1 \
 	file://docker.service \
@@ -32,7 +32,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aadc30f9c14d876ded7bedc0afd2d3d7"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "1.12.0"
+DOCKER_VERSION = "1.12.5"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
 DEPENDS = "go-cross \
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 2/4] docker: update description
  2016-12-20  9:25 [PATCH v2 1/4] docker: update to docker 1.12.5 release Fathi Boudra
@ 2016-12-20  9:25 ` Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 3/4] docker: use a switch to set GOARCH based on TARGET_ARCH value Fathi Boudra
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Fathi Boudra @ 2016-12-20  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: bruce.ashfield, koen.kooi

* reword docker officially supported hosts section
* bump minimal required kernel from 3.8 to 3.10

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index f50f25a..37df3c4 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -9,11 +9,11 @@ DESCRIPTION = "Linux container runtime \
  large-scale web deployments, database clusters, continuous deployment \
  systems, private PaaS, service-oriented architectures, etc. \
  . \
- This package contains the daemon and client. Using docker.io on non-amd64 \
- hosts is not supported at this time. Please be careful when using it \
- on anything besides amd64. \
+ This package contains the daemon and client. Using docker.io is \
+ officially supported on x86_64 and arm (32-bit) hosts. \
+ Other architectures are considered experimental. \
  . \
- Also, note that kernel version 3.8 or above is required for proper \
+ Also, note that kernel version 3.10 or above is required for proper \
  operation of the daemon process, and that any lower versions may have \
  subtle and/or glaring issues. \
  "
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 3/4] docker: use a switch to set GOARCH based on TARGET_ARCH value
  2016-12-20  9:25 [PATCH v2 1/4] docker: update to docker 1.12.5 release Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 2/4] docker: update description Fathi Boudra
@ 2016-12-20  9:25 ` Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 4/4] docker: cosmetic - fix indentation Fathi Boudra
  2016-12-20 22:25 ` [PATCH v2 1/4] docker: update to docker 1.12.5 release Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Fathi Boudra @ 2016-12-20  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: bruce.ashfield, koen.kooi

It allows to:
* easily extend future architecture added/supported
* tune arm architecture and set GOARM as appropriate

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 recipes-containers/docker/docker_git.bb | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 37df3c4..d163b13 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}"
-	# supported amd64, 386, arm arm64
-	if [ "${TARGET_ARCH}" = "x86_64" ]; then
-		export GOARCH="amd64"
-	fi
-	if [ "${TARGET_ARCH}" = "aarch64" ]; then
-		export GOARCH="arm64"
-	fi
+	case "${TARGET_ARCH}" in
+		arm)
+			GOARCH=arm
+			case "${TUNE_PKGARCH}" in
+				cortexa*)
+					export GOARM=7
+				;;
+			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
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 4/4] docker: cosmetic - fix indentation
  2016-12-20  9:25 [PATCH v2 1/4] docker: update to docker 1.12.5 release Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 2/4] docker: update description Fathi Boudra
  2016-12-20  9:25 ` [PATCH v2 3/4] docker: use a switch to set GOARCH based on TARGET_ARCH value Fathi Boudra
@ 2016-12-20  9:25 ` Fathi Boudra
  2016-12-20 22:25 ` [PATCH v2 1/4] docker: update to docker 1.12.5 release Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Fathi Boudra @ 2016-12-20  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: bruce.ashfield, koen.kooi

cosmetic only, no changes in behavior:
* align all the DEPENDS, better readability
* fix indentation in do_install(): space -> tab

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 recipes-containers/docker/docker_git.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index d163b13..62a016a 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -35,7 +35,8 @@ S = "${WORKDIR}/git"
 DOCKER_VERSION = "1.12.5"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
-DEPENDS = "go-cross \
+DEPENDS = " \
+    go-cross \
     go-cli \
     go-pty \
     go-context \
@@ -136,9 +137,9 @@ do_install() {
 		install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${WORKDIR}/docker.service ${D}/${systemd_unitdir}/system
-        else
-            install -d ${D}${sysconfdir}/init.d
-            install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
+	else
+		install -d ${D}${sysconfdir}/init.d
+		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
 	fi
 
 	mkdir -p ${D}/usr/share/docker/
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/4] docker: update to docker 1.12.5 release
  2016-12-20  9:25 [PATCH v2 1/4] docker: update to docker 1.12.5 release Fathi Boudra
                   ` (2 preceding siblings ...)
  2016-12-20  9:25 ` [PATCH v2 4/4] docker: cosmetic - fix indentation Fathi Boudra
@ 2016-12-20 22:25 ` Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2016-12-20 22:25 UTC (permalink / raw)
  To: Fathi Boudra, meta-virtualization; +Cc: koen.kooi

Looks good to me.

I'll do a quick sanity build and get this merged/pushed out on Wednesday.

Bruce

On 2016-12-20 04:25 AM, Fathi Boudra wrote:
> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> ---
>  recipes-containers/docker/docker_git.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
> index 2cff6f1..f50f25a 100644
> --- a/recipes-containers/docker/docker_git.bb
> +++ b/recipes-containers/docker/docker_git.bb
> @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
>   subtle and/or glaring issues. \
>   "
>
> -SRCREV = "34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b"
> +SRCREV = "7392c3b0ce0f9d3e918a321c66668c5d1ef4f689"
>  SRC_URI = "\
>  	git://github.com/docker/docker.git;nobranch=1 \
>  	file://docker.service \
> @@ -32,7 +32,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aadc30f9c14d876ded7bedc0afd2d3d7"
>
>  S = "${WORKDIR}/git"
>
> -DOCKER_VERSION = "1.12.0"
> +DOCKER_VERSION = "1.12.5"
>  PV = "${DOCKER_VERSION}+git${SRCREV}"
>
>  DEPENDS = "go-cross \
>



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-12-20 22:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20  9:25 [PATCH v2 1/4] docker: update to docker 1.12.5 release Fathi Boudra
2016-12-20  9:25 ` [PATCH v2 2/4] docker: update description Fathi Boudra
2016-12-20  9:25 ` [PATCH v2 3/4] docker: use a switch to set GOARCH based on TARGET_ARCH value Fathi Boudra
2016-12-20  9:25 ` [PATCH v2 4/4] docker: cosmetic - fix indentation Fathi Boudra
2016-12-20 22:25 ` [PATCH v2 1/4] docker: update to docker 1.12.5 release Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.