Update buildroot & docker (#25)

* Update docker & buildroot

* Fix

* fix versions
This commit is contained in:
Pascal Vizeli
2018-05-28 14:58:22 +02:00
committed by GitHub
parent 7db3226a8e
commit b13086072c
1887 changed files with 22062 additions and 18015 deletions

View File

@@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
choice
prompt "Security context"
default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
help
Selects whether or not to enable security context support.
config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
bool "Disable security context support"
config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE
bool "Enable SELinux security context support"
config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL
bool "Enable kernel security context"
endchoice

View File

@@ -68,13 +68,13 @@ else
IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y)
IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y)
IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y)
IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
endif