Browse Source

Merge pull request #8990 from cotequeiroz/lxc_recursive

lxc, libsseccomp: workaround recursive dependency
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
7f2adfd7cc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
  1. +5
    -2
      libs/libseccomp/Makefile
  2. +1
    -0
      utils/lxc/Config.in

+ 5
- 2
libs/libseccomp/Makefile View File

@ -26,6 +26,11 @@ PKG_CONFIG_DEPENDS:= \
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
SUBMENU:=
@ -33,7 +38,6 @@ define Package/libseccomp/Default
CATEGORY:=Libraries
TITLE:=seccomp
URL:=https://github.com/seccomp/libseccomp/wiki
DEPENDS:=@!arc
endef
define Package/libseccomp/Default/description
@ -47,7 +51,6 @@ endef
define Package/libseccomp
$(call Package/libseccomp/Default)
TITLE+= (library)
DEPENDS+=
endef
define Package/scmp_sys_resolver


+ 1
- 0
utils/lxc/Config.in View File

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


Loading…
Cancel
Save