feat: update systemd to 256.8, fix cpuset/cgroupsv1

The cpuset/cgroupsv1 is required for cgroupsv1 support. Fix systemd renovate rule. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Nov 27, 2024 · 452298e · 452298e
1 parent c8c66b2
commit 452298e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -69,7 +69,8 @@
         {
             "matchPackageNames": [
                 "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git",
-                "benhoyt/inih"
+                "benhoyt/inih",
+                "systemd/systemd"
             ],
             "versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$"
         },

diff --git a/Pkgfile b/Pkgfile
@@ -37,9 +37,9 @@ vars:
   e2fsprogs_sha512: 7e59746e14df9e29034693f415dc4bcbd405217712e2d9e594dcc755bbc1c9f3c4f66ba37e4289b022c337c5aae3d96561c0cd88fa21082ed1017d2a000d3b82
 
   # renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=systemd/systemd
-  systemd_version: 256.6
-  systemd_sha256: c085f162dec001407dd32f00abbf20b7e6ed7043dcfaf8ed954787d86707f409
-  systemd_sha512: 99d0fad02cab3559e081dabc2797d1d66bbc21daf9aaec847aeb6bce289456ff9c8599a34563c9bfa3826db36ae9ab30836b09bae00bf1a410b54d0bad9bd4dc
+  systemd_version: 256.8
+  systemd_sha256: b3d003b4f6d1ab0bfae0cf7a37c4aa559923c49bc8e9d1331b7459e12ebc357a
+  systemd_sha512: 0cdd41274b79177705f6999194ea2698e8bccd123d983733972e0fba4ece5467eddefec419a992d1646e93adda7b811810deec163a15f2c9347473caefe2ce09
 
   # renovate: datasource=github-releases depName=flannel-io/cni-plugin
   flannel_cni_version: v1.5.1-flannel3

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -209,7 +209,7 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
-# CONFIG_CPUSETS_V1 is not set
+CONFIG_CPUSETS_V1=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -204,7 +204,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
-# CONFIG_CPUSETS_V1 is not set
+CONFIG_CPUSETS_V1=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y