From 341cc047b9174280d89f1b5494a42837ccbadb12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Mon, 25 Nov 2024 21:23:54 +0000 Subject: [PATCH] Revert "target,base-files: unify handling of procd-ujail" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- 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))) -- 2.30.2