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 4c65359 ("build:
fix including busybox, procd and apk/opkg in imagebuilder").

Fixes: 44598c2 ("build: remove broken dependency of metadata on toplevel .config variables")
Signed-off-by: Petr Štetiar <[email protected]>
Link: openwrt/openwrt#16986
Signed-off-by: Robert Marko <[email protected]>

Author: ynezz

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

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