From 319cf155ed05da1589e564b47f6d8655137e0ad8 Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 3 Dec 2024 18:46:31 +0000 Subject: [PATCH 1/2] Require CONFIG_MEMCG_V1 Kernel 6.11 deprecates MEMCG_V1 and puts it behind this config option. This is required by the jolla tmpfiles configuration and is used by lipstick. --- mer_verify_kernel_config | 1 + 1 file changed, 1 insertion(+) diff --git a/mer_verify_kernel_config b/mer_verify_kernel_config index e3579af..a7230ea 100755 --- a/mer_verify_kernel_config +++ b/mer_verify_kernel_config @@ -306,6 +306,7 @@ CONFIG_LOCKD y,m,! # optional, for NFS support CONFIG_MEMCG_KMEM y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 CONFIG_MEMCG_SWAP y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 CONFIG_MEMCG y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if version >= 3.6 +CONFIG_MEMCG_V1 y,!,>=6.11 # systemd-tmpfiles required for jolla systemd-tmpfiles configuration. memcg_v1 is deprecated from kernel 6.11 onward and this enables it again CONFIG_MODULES y,! # optional, required for module support (Such as WLAN for example) CONFIG_NAMESPACES y # Namespacing is needed by firejail CONFIG_NET_CLS_CGROUP y,! # systemd (optional): https://github.com/systemd/systemd/blob/v238/README From 3a592d0c4b4d169a740460de9f45fa8f896da11f Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 3 Dec 2024 21:45:38 +0000 Subject: [PATCH 2/2] Add additional rules for MEMCG_KMEM and MEMCG_SWAP --- mer_verify_kernel_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mer_verify_kernel_config b/mer_verify_kernel_config index a7230ea..653d315 100755 --- a/mer_verify_kernel_config +++ b/mer_verify_kernel_config @@ -303,8 +303,8 @@ CONFIG_L2TP_IP y,m,! # Support for L2TP-over-IP socket family. Enables L2TPIP CONFIG_LBDAF y,! # ext4 filesystem requires this in order to support filesysetms with huge_file feature, which is enabled by default by mke2fs.ext4, not needed for 64bit architectures CONFIG_LOCKD_V4 y,! # optional, for NFS support CONFIG_LOCKD y,m,! # optional, for NFS support -CONFIG_MEMCG_KMEM y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 -CONFIG_MEMCG_SWAP y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 +CONFIG_MEMCG_KMEM y,!,>=3.6,<=6.10 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 and removed in 6.11 +CONFIG_MEMCG_SWAP y,!,>=3.6,<=6.0 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if kernel version >= 3.6 and removed in 6.1 CONFIG_MEMCG y,!,>=3.6 # systemd (optional, but recommended): https://github.com/systemd/systemd/blob/v238/README, only valid if version >= 3.6 CONFIG_MEMCG_V1 y,!,>=6.11 # systemd-tmpfiles required for jolla systemd-tmpfiles configuration. memcg_v1 is deprecated from kernel 6.11 onward and this enables it again CONFIG_MODULES y,! # optional, required for module support (Such as WLAN for example)