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

This reverts commit ac64071 as it removes base-files package when KERNEL_NAMESPACES is deselected, as base-files depends on procd-ujail which needs KERNEL_NAMESPACES. Fixes: openwrt#17075 Link: openwrt#17081 Link: openwrt#17081 Signed-off-by: Petr Štetiar <[email protected]>
vincejv · Nov 26, 2024 · 102fe1a · 102fe1a
1 parent e95f24b
commit 102fe1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)))