[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

There is no reason to link Go binaries statically, unless when
BR2_STATIC_LIBS=y.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/docker-containerd/docker-containerd.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index b1acd44..06432e9 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -18,8 +18,11 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
 	GOPATH="$(DOCKER_CONTAINERD_GOPATH)"
 
 DOCKER_CONTAINERD_GLDFLAGS = \
-	-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) \
-	-extldflags '-static'
+	-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
+
+ifeq ($(BR2_STATIC_LIBS),y)
+DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static'
+endif
 
 define DOCKER_CONTAINERD_CONFIGURE_CMDS
 	mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker
-- 
2.7.4

[Buildroot] [PATCH 2/3] flannel: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

There is no reason to link Go binaries statically, unless when
BR2_STATIC_LIBS=y.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/flannel/flannel.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
index b5f61a0..18c0af1 100644
--- a/package/flannel/flannel.mk
+++ b/package/flannel/flannel.mk
@@ -21,7 +21,10 @@ FLANNEL_MAKE_ENV = \
 
 FLANNEL_GLDFLAGS = \
 	-X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) \
-	-extldflags '-static'
+
+ifeq ($(BR2_STATIC_LIBS),y)
+FLANNEL_GLDFLAGS += -extldflags '-static'
+endif
 
 define FLANNEL_CONFIGURE_CMDS
 	# Put sources at prescribed GOPATH location.
-- 
2.7.4

[Buildroot] [PATCH 2/3] flannel: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Christian Stewart]

Thomas,

Works fine, tested on aarch64, arm, and x86-64.

Tested-by: Christian Stewart <christian@paral.in>

On Sun, Jul 24, 2016 at 7:43 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> There is no reason to link Go binaries statically, unless when
> BR2_STATIC_LIBS=y.

Best,
Christian

[Buildroot] [PATCH 3/3] runc: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

There is no reason to link Go binaries statically, unless when
BR2_STATIC_LIBS=y.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/runc/runc.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index 1396e0c..7ebba57 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -19,8 +19,11 @@ RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
 	PATH=$(BR_PATH)
 
 RUNC_GLDFLAGS = \
-	-X main.gitCommit=$(RUNC_VERSION) \
-	-extldflags '-static'
+	-X main.gitCommit=$(RUNC_VERSION)
+
+ifeq ($(BR2_STATIC_LIBS),y)
+FLANNEL_GLDFLAGS += -extldflags '-static'
+endif
 
 RUNC_GOTAGS = cgo static_build
 
-- 
2.7.4

[Buildroot] [PATCH 3/3] runc: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Christian Stewart]

Thomas,

Works fine, tested on aarch64, arm, and x86-64.

Tested-by: Christian Stewart <christian@paral.in>

On Sun, Jul 24, 2016 at 7:43 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> There is no reason to link Go binaries statically, unless when
> BR2_STATIC_LIBS=y.

Best,
Christian

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Christian Stewart]

Thomas,

On Sun, Jul 24, 2016 at 7:43 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> There is no reason to link Go binaries statically, unless when
> BR2_STATIC_LIBS=y.

Acknowledged, this series looks OK to me but I will do some runtime
testing today and get back to you, probably around the same time of my
next docker-engine series revision.

Best,
Christian

PS: Email look OK now?

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

Hello,

On Sun, 24 Jul 2016 09:30:37 -0700, Christian Stewart wrote:

> Acknowledged, this series looks OK to me but I will do some runtime
> testing today and get back to you, probably around the same time of my
> next docker-engine series revision.

Thanks. I'll wait for your formal Tested-by then.

> PS: Email look OK now?

Email looks perfect now. This e-mail only has a plain text variant, and
this plain text variant is good.

I generally don't mind when people send plain text + HTML, but in your
case, the plain text variant was terrible :-/

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Christian Stewart]

Thomas,

On Sun, Jul 24, 2016 at 12:32 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Thanks. I'll wait for your formal Tested-by then.

Works fine, runtime-tested on aarch64, arm, and x86-64.

Tested-by: Christian Stewart <christian@paral.in>

Best,
Christian

> Email looks perfect now. This e-mail only has a plain text variant, and
> this plain text variant is good.

Great. I just forced gmail into plain text mode.

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

Hello,

On Sun, 24 Jul 2016 12:36:19 -0700, Christian Stewart wrote:

> Works fine, runtime-tested on aarch64, arm, and x86-64.
> 
> Tested-by: Christian Stewart <christian@paral.in>

Thanks!

> > Email looks perfect now. This e-mail only has a plain text variant, and
> > this plain text variant is good.  
> 
> Great. I just forced gmail into plain text mode.

OK, thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y

[Thomas Petazzoni]

Hello,

On Sun, 24 Jul 2016 16:43:45 +0200, Thomas Petazzoni wrote:
> There is no reason to link Go binaries statically, unless when
> BR2_STATIC_LIBS=y.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  package/docker-containerd/docker-containerd.mk | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

All three patches applied with Christian's Tested-by. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com