From b4e6f79619cf109ace89ec6fc0c2dfbb64c4e2d3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 4 Jul 2024 19:11:14 -0600 Subject: [PATCH] package/systemd: enable required oomd kernel options In order for systemd-oomd to run CONFIG_PSI and CONFIG_MEMCG must be enabled in the kernel config. See: https://github.com/systemd/systemd/commit/e7b3f1a6c358dd3eaf0b50547bd52130ad4126ae https://github.com/systemd/systemd/commit/aa329b89223a79793cde8288b1bc6e93db174938 Signed-off-by: James Hilliard Signed-off-by: Romain Naour (cherry picked from commit be5f14657a5540fdabb03ba8b5ff64c0da804e32) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 05ce380917..448f9cb671 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -479,6 +479,10 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer +define SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PSI) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) +endef else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -803,6 +807,8 @@ define SYSTEMD_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) + + $(SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS) endef # We need a very minimal host variant, so we disable as much as possible.