mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LXC
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
|
||||
help
|
||||
Linux Containers (LXC), provides the ability to group and
|
||||
isolate of a set of processes in a jail by virtualizing and
|
||||
@@ -14,9 +15,10 @@ config BR2_PACKAGE_LXC
|
||||
|
||||
https://linuxcontainers.org/
|
||||
|
||||
comment "lxc needs a toolchain w/ threads, headers >= 3.0, dynamic library, gcc >= 4.7"
|
||||
comment "lxc needs a glibc or musl toolchain w/ threads, headers >= 3.0, dynamic library, gcc >= 4.7"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
|
||||
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \
|
||||
|| BR2_STATIC_LIBS
|
||||
|| BR2_STATIC_LIBS \
|
||||
|| BR2_TOOLCHAN_USES_UCLIBC
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5 lxc-3.1.0.tar.gz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
sha256 3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995 lxc-4.0.4.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
||||
|
||||
@@ -4,14 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LXC_VERSION = 3.1.0
|
||||
LXC_VERSION = 4.0.4
|
||||
LXC_SITE = https://linuxcontainers.org/downloads/lxc
|
||||
LXC_LICENSE = LGPL-2.1+
|
||||
LXC_LICENSE_FILES = COPYING
|
||||
LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+
|
||||
LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1
|
||||
LXC_DEPENDENCIES = host-pkgconf
|
||||
LXC_INSTALL_STAGING = YES
|
||||
|
||||
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
|
||||
LXC_CONF_OPTS = \
|
||||
--disable-apparmor \
|
||||
--disable-examples \
|
||||
--with-distro=buildroot \
|
||||
--disable-werror \
|
||||
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
|
||||
|
||||
@@ -19,13 +22,6 @@ ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
|
||||
LXC_DEPENDENCIES += bash-completion
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
LXC_CONF_OPTS += --enable-gnutls
|
||||
LXC_DEPENDENCIES += gnutls
|
||||
else
|
||||
LXC_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
LXC_CONF_OPTS += --enable-capabilities
|
||||
LXC_DEPENDENCIES += libcap
|
||||
@@ -47,4 +43,11 @@ else
|
||||
LXC_CONF_OPTS += --disable-selinux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LXC_CONF_OPTS += --enable-openssl
|
||||
LXC_DEPENDENCIES += openssl
|
||||
else
|
||||
LXC_CONF_OPTS += --disable-openssl
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user