diff options
| author | Robert Marko | 2024-11-23 13:29:49 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-01-03 10:18:56 +0000 |
| commit | 184d1c93cbe47e70c8bb4b01ddf7dc9152a58e23 (patch) | |
| tree | a9914789407633e4f3afaade3f5c56b3edded88a | |
| parent | 933ae0699ae61b1e841c08ffe41aa7eea0ca673d (diff) | |
| download | openwrt-184d1c93cbe47e70c8bb4b01ddf7dc9152a58e23.tar.gz | |
config: rename SECCOMP to USE_SECCOMP
It seems that we have some kind of a symbol name conflict which causes
CONFIG_SECCOMP to always be read as y.
Unfortunatelly, I could not figure out what is causing this, but simply
renaming SECCOMP to USE_SECCOMP seems to properly work and leaves the
symbol unset unless arch dependencies are satisfied.
This fixes qoriq and others that dont support seccomp from failing due
to procd-seccomp package being selected to get included but it cannot be
built for them:
ERROR: unable to select packages:
procd-seccomp (no such package):
required by: base-files-1637~52b6c92479[procd-seccomp]
Fixes: 4c65359af49b ("build: fix including busybox, procd and apk/opkg in imagebuilder")
Link: https://github.com/openwrt/openwrt/pull/17048
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit a48ec449ccab0069e84a72837bf06ba543e53aec)
| -rw-r--r-- | config/Config-build.in | 2 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/system/procd/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/Config-build.in b/config/Config-build.in index ae44985546..08acae63d3 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/package/base-files/Makefile b/package/base-files/Makefile index 7ac4ea557f..c78c073699 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 TITLE:=Base filesystem for OpenWrt URL:=http://openwrt.org/ diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 88467c2e59..7a2276a46d 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 |