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

lxc: allow building with seccomp

Browse source 
seccomp was unconditionally disabled before.
Also a non-escaped newline in a place where it should be escaped
made the build process skip some CONFIGURE_ARGS.
Fix CONFIGURE_ARGS and add an option to allow building with seccomp.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2015-06-04 13:46:32 +02:00
parent 93584e3cbe
commit 180d34f70b
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/lxc/Config.in
View file

@ -27,4 +27,11 @@ config LXC_BUSYBOX_OPTIONS
Select needed busybox options for lxc-create utility. This include XZ tar Select needed busybox options for lxc-create utility. This include XZ tar
compression, long option support for tar and built-in getopt support. compression, long option support for tar and built-in getopt support.
config LXC_SECCOMP
bool "Enable support for seccomp in LXC"
default KERNEL_SECCOMP
help
Build LXC with support for seccomp filters.
Select libseccomp which also pulls-in the needed kernel features.
endmenu endmenu

13
utils/lxc/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lxc PKG_NAME:=lxc
PKG_VERSION:=1.1.2 PKG_VERSION:=1.1.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org> PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@ -94,7 +94,7 @@ define Package/liblxc
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=LXC userspace library TITLE:=LXC userspace library
DEPENDS:= lxc +libcap +libpthread DEPENDS:= lxc +libcap +libpthread +LXC_SECCOMP:libseccomp
endef endef
define Package/lxc-lua define Package/lxc-lua
@ -113,9 +113,14 @@ CONFIGURE_ARGS += \
--disable-apparmor \ --disable-apparmor \
--disable-doc \ --disable-doc \
--disable-examples \ --disable-examples \
--disable-seccomp
--enable-lua=yes \ --enable-lua=yes \
--with-lua-pc="$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc" \ --with-lua-pc="$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc"
ifeq ($(CONFIG_LXC_SECCOMP),y)
CONFIGURE_ARGS += --enable-seccomp
else
CONFIGURE_ARGS += --disable-seccomp
endif
MAKE_FLAGS += \ MAKE_FLAGS += \
LUA_INSTALL_CMOD="/usr/lib/lua" \ LUA_INSTALL_CMOD="/usr/lib/lua" \