Skip to content

Commit

Permalink
config: rename SECCOMP to USE_SECCOMP
Browse files Browse the repository at this point in the history
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: 4c65359 ("build: fix including busybox, procd and apk/opkg in imagebuilder")
Link: openwrt/openwrt#17048
Signed-off-by: Robert Marko <[email protected]>
(cherry picked from commit a48ec44)
  • Loading branch information
robimarko authored and nbd168 committed Jan 3, 2025
1 parent 933ae06 commit 184d1c9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/Config-build.in
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ menu "Global build settings"

endchoice

config SECCOMP
config USE_SECCOMP
bool "Enable SECCOMP"
select KERNEL_SECCOMP
select PACKAGE_procd-seccomp
Expand Down
2 changes: 1 addition & 1 deletion package/base-files/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion package/system/procd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 184d1c9

Please sign in to comment.