diff --git a/config/Config-build.in b/config/Config-build.in index 6db2354e88c..2a95891ecf5 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -423,7 +423,7 @@ menu "Global build settings" endchoice - config SECCOMP + config USE_SECCOMP bool "Enable SECCOMP" select KERNEL_SECCOMP select PACKAGE_procd-seccomp diff --git a/include/toplevel.mk b/include/toplevel.mk index e5f5e0fecd8..a52c56832ec 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -78,7 +78,7 @@ _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p)) # Config that will invalidate the .targetinfo as they will affect # DEFAULT_PACKAGES. # Keep DYNAMIC_DEF_PKG_CONF in sync with target.mk to reflect the same configs -DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_SECCOMP +DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_USE_SECCOMP check-dynamic-def-pkg: FORCE @+DEF_PKG_CONFS=""; \ if [ -f $(TOPDIR)/.config ]; then \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a2ea3c5d008..ff7891f18cb 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -42,7 +42,7 @@ define Package/base-files DEPENDS:= \ +netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring \ +NAND_SUPPORT:ubi-utils +fstools +fwtool \ - +SELINUX:procd-selinux +!SELINUX:procd +SECCOMP:procd-seccomp \ + +SELINUX:procd-selinux +!SELINUX:procd +USE_SECCOMP:procd-seccomp \ +SELINUX:busybox-selinux +!SELINUX:busybox +!SMALL_FLASH:procd-ujail TITLE:=Base filesystem for OpenWrt URL:=http://openwrt.org/ diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 81e133f55bc..b9099a5ba52 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -71,7 +71,7 @@ endef define Package/procd-seccomp SECTION:=base CATEGORY:=Base system - DEPENDS:=@SECCOMP +libubox +libblobmsg-json + DEPENDS:=@USE_SECCOMP +libubox +libblobmsg-json TITLE:=OpenWrt process seccomp helper + utrace endef