build: fix including busybox, procd and apk/opkg in imagebuilder

Since the image builder pulls package lists from metadata directly,
add procd and busybox as depdendencies to base-files.
As for the package manager itself, since it can be disabled it needs
to be added directly in the image builder makefile

Fixes: 44598c233d ("build: remove broken dependency of metadata on toplevel .config variables")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2024-11-13 07:04:31 +01:00
parent f84187035e
commit 4c65359af4
4 changed files with 10 additions and 6 deletions

View File

@@ -50,7 +50,6 @@ define Package/procd
$(call Package/procd/Default)
VARIANT:=default
CONFLICTS:=procd-selinux
DEFAULT:=y if !SELINUX
endef
define Package/procd-selinux
@@ -59,7 +58,6 @@ define Package/procd-selinux
TITLE += with SELinux support
PROVIDES:=procd
VARIANT:=selinux
DEFAULT:=y if SELINUX
endef
define Package/procd-ujail
@@ -75,7 +73,6 @@ define Package/procd-seccomp
CATEGORY:=Base system
DEPENDS:=@SECCOMP +libubox +libblobmsg-json
TITLE:=OpenWrt process seccomp helper + utrace
DEFAULT:=y if SECCOMP
endef
define Package/uxc