From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 9 Dec 2020 12:45:55 +0000 (+0000)
Subject: kernel: enable kernel keyring by default on !SMALL_FLASH
X-Git-Tag: v21.02.0-rc1~828
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23049f9c31f030829980b7e32e424435572ae9ac;p=openwrt%2Fstaging%2Fchunkeey.git

kernel: enable kernel keyring by default on !SMALL_FLASH

Enable CONFIG_KEYS by default on systems which are not marked as
flash-space constraint by the 'small_flash' feature.
CONFIG_KEYS is required by Docker, enabling it in our kernel allows
users to run Docker on stock OpenWrt.
It is also used of by some network file systems (such as NFSv4) to
store credentials as well as UID/GID mappings.

Adds about 50kB to vmlinux on ath79/generic (~18kB compressed)

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index b5eba78719..3f013aa2b2 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -532,7 +532,7 @@ endif
 
 config KERNEL_KEYS
 	bool "Enable kernel access key retention support"
-	default n
+	default !SMALL_FLASH
 
 config KERNEL_PERSISTENT_KEYRINGS
 	bool "Enable kernel persistent keyrings"