Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8990 from cotequeiroz/lxc_recursive

Browse source 
lxc, libsseccomp: workaround recursive dependency
This commit is contained in:
Rosen Penev 2019-05-16 14:38:16 -07:00 committed by GitHub
commit 7f2adfd7cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/libseccomp/Makefile
View file

@ -26,6 +26,11 @@ PKG_CONFIG_DEPENDS:= \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# This is done instead of DEPENDS:=@!arc to avoid a recursive dependency when
# the library is conditionally selected by util/lxc.
define Package/libseccomp/config
depends on !arc
endef
define Package/libseccomp/Default define Package/libseccomp/Default
SUBMENU:= SUBMENU:=
@ -33,7 +38,6 @@ define Package/libseccomp/Default
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=seccomp TITLE:=seccomp
URL:=https://github.com/seccomp/libseccomp/wiki URL:=https://github.com/seccomp/libseccomp/wiki
DEPENDS:=@!arc
endef endef
define Package/libseccomp/Default/description define Package/libseccomp/Default/description
@ -47,7 +51,6 @@ endef
define Package/libseccomp define Package/libseccomp
$(call Package/libseccomp/Default) $(call Package/libseccomp/Default)
TITLE+= (library) TITLE+= (library)
DEPENDS+=
endef endef
define Package/scmp_sys_resolver define Package/scmp_sys_resolver

1
utils/lxc/Config.in
View file

@ -38,6 +38,7 @@ config LXC_BUSYBOX_OPTIONS
config LXC_SECCOMP config LXC_SECCOMP
bool "Enable support for seccomp in LXC" bool "Enable support for seccomp in LXC"
default KERNEL_SECCOMP default KERNEL_SECCOMP
depends on !arc
help help
Build LXC with support for seccomp filters. Build LXC with support for seccomp filters.
Select libseccomp which also pulls-in the needed kernel features. Select libseccomp which also pulls-in the needed kernel features.