domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
(cherry picked from commit 4c65359af4)
This commit is contained in:
Felix Fietkau
2024-11-13 07:04:31 +01:00
parent 83afb428b0
commit f97e729f8c
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/utils/busybox/Makefile
View File

@@ -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