[openwrt/openwrt] Revert "target,base-files: unify handling of procd-ujail"

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/341cc047b9174280d89f1b5494a42837ccbadb12

commit 341cc047b9174280d89f1b5494a42837ccbadb12
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Mon Nov 25 21:23:54 2024 +0000

    Revert "target,base-files: unify handling of procd-ujail"
    
    This reverts commit ac640718aa0ceae55969bb9e7e45d00bb7bc228a as it
    removes base-files package when KERNEL_NAMESPACES is deselected, as
    base-files depends on procd-ujail which needs KERNEL_NAMESPACES.
    
    Fixes: #17075
    Link: https://github.com/openwrt/openwrt/pull/17081
    Link: https://github.com/openwrt/openwrt/pull/17081
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 include/target.mk           | 5 +++++
 package/base-files/Makefile | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/target.mk b/include/target.mk
index 1b32bf905d..02ea68b15c 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -90,6 +90,11 @@ 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 ff7891f18c..b90ee3a64e 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 +USE_SECCOMP:procd-seccomp \
-	+SELINUX:busybox-selinux +!SELINUX:busybox +!SMALL_FLASH:procd-ujail
+	+SELINUX:busybox-selinux +!SELINUX:busybox
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION)))