All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/runc: add an option to build a non-static runc
@ 2019-10-23  9:34 James Peach
  2019-10-25 16:45 ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: James Peach @ 2019-10-23  9:34 UTC (permalink / raw)
  To: buildroot

From: James Peach <jpeach@apache.org>

The systemd cgroup driver is compiled out of static builds of
runc so some users will need a non-static build. Add an option
to control whether the runc should be static or not, and default
it to true for compatibility with existing configurations.

Signed-off-by: James Peach <jpeach@apache.org>
---
 package/runc/Config.in | 11 +++++++++++
 package/runc/runc.mk   |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git package/runc/Config.in package/runc/Config.in
index f181ee334f..ea932120b8 100644
--- package/runc/Config.in
+++ package/runc/Config.in
@@ -10,6 +10,17 @@ config BR2_PACKAGE_RUNC
 
 	  https://github.com/opencontainers/runc
 
+if BR2_PACKAGE_RUNC
+
+config BR2_PACKAGE_RUNC_STATIC
+	bool "static runc binary"
+	default y
+	help
+	  Whether to make a static build of runc. This must be false
+	  for runc to be able to use the systemd cgroups driver.
+
+endif
+
 comment "runc needs a glibc or musl toolchain w/ threads"
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \
 		BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
diff --git package/runc/runc.mk package/runc/runc.mk
index b858742905..4128afd53a 100644
--- package/runc/runc.mk
+++ package/runc/runc.mk
@@ -13,7 +13,11 @@ RUNC_WORKSPACE = Godeps/_workspace
 
 RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
 
-RUNC_TAGS = cgo static_build
+RUNC_TAGS = cgo
+
+ifeq ($(BR2_PACKAGE_RUNC_STATIC),y)
+RUNC_TAGS += static_build
+endif
 
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
 RUNC_TAGS += seccomp
-- 
2.21.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-10-28 10:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-23  9:34 [Buildroot] [PATCH 1/1] package/runc: add an option to build a non-static runc James Peach
2019-10-25 16:45 ` Peter Korsgaard
2019-10-25 21:19   ` James Peach
2019-10-28 10:33     ` James Peach

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.