aboutsummaryrefslogtreecommitdiff
path: root/package/lxc
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2017-05-19 16:15:59 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-20 16:17:07 +0200
commit5f16c203185011548bf6dd036e344521a46e0307 (patch)
treeaf87742e0671c35b9d8b05050f7465973a70be0f /package/lxc
parent34761b2c409cf4bfd8be46e2e531adeafb39b742 (diff)
downloadbuildroot-5f16c203185011548bf6dd036e344521a46e0307.tar.gz
buildroot-5f16c203185011548bf6dd036e344521a46e0307.tar.bz2
lxc: set libcap as an optional dependency
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/lxc')
-rw-r--r--package/lxc/Config.in1
-rw-r--r--package/lxc/lxc.hash1
-rw-r--r--package/lxc/lxc.mk13
3 files changed, 13 insertions, 2 deletions
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index c5c75ea70f..22aa813197 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_LXC
# build system forcefully builds a shared library
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
- select BR2_PACKAGE_LIBCAP
help
Linux Containers (LXC), provides the ability to group and isolate
of a set of processes in a jail by virtualizing and accounting the
diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index 086b139120..801759aad5 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,2 +1,3 @@
# Locally calculated
sha256 0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 lxc-2.0.8.tar.gz
+sha256 c79443c5db7e7defd53992d120cad2bc8afc2ff363b1e84ec31bc2b95ec5ca44 bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index 4ba6d9fe43..8a200e7d3c 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -8,9 +8,13 @@ LXC_VERSION = 2.0.8
LXC_SITE = https://linuxcontainers.org/downloads/lxc
LXC_LICENSE = LGPL-2.1+
LXC_LICENSE_FILES = COPYING
-LXC_DEPENDENCIES = libcap host-pkgconf
+LXC_DEPENDENCIES = host-pkgconf
LXC_INSTALL_STAGING = YES
+# This patch fixes compilation without capabilities
+LXC_PATCH = \
+ https://github.com/lxc/lxc/commit/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
+
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-python --disable-werror \
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
@@ -22,6 +26,13 @@ else
LXC_CONF_OPTS += --disable-gnutls
endif
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+LXC_CONF_OPTS += --enable-capabilities
+LXC_DEPENDENCIES += libcap
+else
+LXC_CONF_OPTS += --disable-capabilities
+endif
+
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
LXC_CONF_OPTS += --enable-seccomp
LXC_DEPENDENCIES += libseccomp