From ac640718aa0ceae55969bb9e7e45d00bb7bc228a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Sun, 17 Nov 2024 04:12:23 +0000 Subject: [PATCH] target,base-files: unify handling of procd-ujail MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the remaining special handling of procd-ujail in a same way as the rest of the packages was handled in the commit 4c65359af49b ("build: fix including busybox, procd and apk/opkg in imagebuilder"). Fixes: 44598c233dd9 ("build: remove broken dependency of metadata on toplevel .config variables") Signed-off-by: Petr Å tetiar Link: https://github.com/openwrt/openwrt/pull/16986 Signed-off-by: Robert Marko --- include/target.mk | 5 ----- package/base-files/Makefile | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/target.mk b/include/target.mk index 02ea68b15c..1b32bf905d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -90,11 +90,6 @@ else endif endif -# include ujail on systems with enough storage -ifeq ($(filter small_flash,$(FEATURES)),) - DEFAULT_PACKAGES+=procd-ujail -endif - # Add device specific packages (here below to allow device type set from subtarget) DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2725bcb90b..a2ea3c5d00 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -43,7 +43,7 @@ define Package/base-files +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:busybox-selinux +!SELINUX:busybox + +SELINUX:busybox-selinux +!SELINUX:busybox +!SMALL_FLASH:procd-ujail TITLE:=Base filesystem for OpenWrt URL:=http://openwrt.org/ VERSION:=$(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION))) -- 2.30.2