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:
@@ -56,7 +56,6 @@ define Package/busybox
|
||||
$(call Package/busybox/Default)
|
||||
CONFLICTS:=busybox-selinux
|
||||
VARIANT:=default
|
||||
DEFAULT:=y if !SELINUX
|
||||
endef
|
||||
|
||||
define Package/busybox-selinux
|
||||
@@ -65,7 +64,6 @@ define Package/busybox-selinux
|
||||
DEPENDS += +libselinux
|
||||
VARIANT:=selinux
|
||||
PROVIDES:=busybox
|
||||
DEFAULT:=y if SELINUX
|
||||
endef
|
||||
|
||||
define Package/busybox/description
|
||||
|
||||
Reference in New Issue
Block a user