target,base-files: unify handling of procd-ujail

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 <ynezz@true.cz>
Link: https://github.com/openwrt/openwrt/pull/16986
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/include/target.mk b/include/target.mk
index 02ea68b15c81216fdeeeeca92aaf6736d155a728..1b32bf905d6d3c9030bcec5c087b58bc804d3dab 100644 (file)
--- 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 2725bcb90b3d22787ddf7897949833b4d319bf33..a2ea3c5d00847e00ce675cb40109e009dcfbe0c0 100644 (file)
--- 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)))