package/systemd: enable required oomd kernel options
PATCH v2 1/1 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
---
Changes v1 -> v2:
- add links to readme commits
--- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/systemd/systemd.mk +6 -0
@@ -480,6 +480,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
@@ -804,6 +808,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.
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Romain Naour via buildroot
AppliedHello James,
Le 05/07/2024 à 03:11, James Hilliard a écrit :
Quoted 8 lines
In order for systemd-oomd to run
CONFIG_PSIandCONFIG_MEMCGmust be enabled in the kernel config.See:
https://github.com/systemd/systemd/commit/e7b3f1a6c358dd3eaf0b50547bd52130ad4126ae
https://github.com/systemd/systemd/commit/aa329b89223a79793cde8288b1bc6e93db174938Signed-off-by James Hilliard <[email protected]>
Applied to master, thanks.
Best regards,
Romain
Quoted 23 lines
---
Changes v1 -> v2:
- add links to readme commits--- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/systemd/systemd.mk +4
-0@@ -480,6 +480,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
package/systemd/systemd.mk define SYSTEMD_LINUX_CONFIG_FIXUPS · line 815
Quoted 8 lines
package/systemd/systemd.mk +2
-0@@ -804,6 +808,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.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
In order for systemd-oomd to run
CONFIG_PSIandCONFIG_MEMCGmust be enabled in the kernel config.
Quoted 8 lines
See:
https://github.com/systemd/systemd/commit/e7b3f1a6c358dd3eaf0b50547bd52130ad4126ae
https://github.com/systemd/systemd/commit/aa329b89223a79793cde8288b1bc6e93db174938Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- add links to readme commits
Committed to 2024.02.x and 2024.05.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot