浏览代码

buildsystem: add CONFIG_SECCOMP

Until now, this feature was switched on via the kernel configuration
option KERNEL_SECCOMP.

The follwing change a7f794cd2aa104fdbd4c6e38f9b76373bf9b96e1 now requires that
the package procd-seccomp must also enabled for buildinmg.

However, this is not the case we have no dependency and the imagebuilder
cannot build the image, because of the implicit package selection.

This change adds a new configuration option CONFIG_SECCOMP.
The new option  has the same behaviour as the configuration
option CONFIG_SELINUX.

If the CONFIG_SECCOMP is selected then the package procd-seccomp and
KERNEL_SECCOMP is enabled for this build.

Signed-off-by: Florian Eckert <[email protected]>
Signed-off-by: Daniel Golle <[email protected]>
Florian Eckert 4 年之前
父节点
当前提交
b118efa0d2
共有 3 个文件被更改,包括 14 次插入3 次删除
  1. 12 0
      config/Config-build.in
  2. 1 1
      include/target.mk
  3. 1 2
      package/system/procd/Makefile

+ 12 - 0
config/Config-build.in

@@ -386,4 +386,16 @@ menu "Global build settings"
 
 
 	endchoice
 	endchoice
 
 
+	config SECCOMP
+		bool "Enable SECCOMP"
+		select KERNEL_SECCOMP
+		select PACKAGE_procd-seccomp
+		depends on (aarch64 || arm || armeb || mips || mipsel || i386 || powerpc || x86_64)
+		depends on !TARGET_uml
+		default y
+		help
+		  This option enables seccomp kernel features to safely
+		  execute untrusted bytecode and selects the seccomp-variants
+		  of procd
+
 endmenu
 endmenu

+ 1 - 1
include/target.mk

@@ -39,7 +39,7 @@ DEFAULT_PACKAGES+=procd-ujail
 endif
 endif
 
 
 # include seccomp ld-preload hooks if kernel supports it
 # include seccomp ld-preload hooks if kernel supports it
-ifneq ($(CONFIG_KERNEL_SECCOMP),)
+ifneq ($(CONFIG_SECCOMP),)
 DEFAULT_PACKAGES+=procd-seccomp
 DEFAULT_PACKAGES+=procd-seccomp
 endif
 endif
 
 

+ 1 - 2
package/system/procd/Makefile

@@ -82,8 +82,7 @@ endef
 define Package/procd-seccomp
 define Package/procd-seccomp
   SECTION:=base
   SECTION:=base
   CATEGORY:=Base system
   CATEGORY:=Base system
-  DEPENDS:=@(aarch64||arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
-	  @KERNEL_SECCOMP +libubox +libblobmsg-json
+  DEPENDS:=@SECCOMP +libubox +libblobmsg-json
   TITLE:=OpenWrt process seccomp helper + utrace
   TITLE:=OpenWrt process seccomp helper + utrace
 endef
 endef