diff options
| author | Petr Štetiar | 2024-11-25 21:23:54 +0000 |
|---|---|---|
| committer | Petr Štetiar | 2024-11-26 05:07:33 +0000 |
| commit | 341cc047b9174280d89f1b5494a42837ccbadb12 (patch) | |
| tree | 89382a96c525baea3dd06b6b0dd88f1cc0ab9dec | |
| parent | 5695267847c2fe51290fdbde6ecd7114654f7988 (diff) | |
| download | openwrt-341cc047b9174280d89f1b5494a42837ccbadb12.tar.gz | |
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@true.cz>
| -rw-r--r-- | include/target.mk | 5 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
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))) |