From 7b48ca47fc5266af21de554ba50db895170b99ce Mon Sep 17 00:00:00 2001 From: hanjinpeng Date: Wed, 3 Jul 2024 21:04:43 +0800 Subject: [PATCH] fix missing PIDFS magic issue when compile This fixes the following error: Filesystem found in kernel header but not in filesystems-gperf.gperf: PID_FS_MAGIC --- backport-basic-add-missing-PIDFS-magic.patch | 47 ++++++++++++++++++++ systemd.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 backport-basic-add-missing-PIDFS-magic.patch diff --git a/backport-basic-add-missing-PIDFS-magic.patch b/backport-basic-add-missing-PIDFS-magic.patch new file mode 100644 index 0000000..4218650 --- /dev/null +++ b/backport-basic-add-missing-PIDFS-magic.patch @@ -0,0 +1,47 @@ +From ed01b92e1c92871bbd92711f280e2b2d15753f0e Mon Sep 17 00:00:00 2001 +From: cpackham-atlnz <85916201+cpackham-atlnz@users.noreply.github.com> +Date: Tue, 12 Mar 2024 00:55:36 +1300 +Subject: [PATCH] basic: add PIDFS magic (#31709) + +Kernel commit cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b added pidfs. +Update filesystems-gperf.gperf and missing_magic.h accordingly. + +This fixes the following error building against a bleeding edge kernel. +``` +../src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: + +Filesystem found in kernel header but not in filesystems-gperf.gperf: PID_FS_MAGIC +``` +--- + src/basic/filesystems-gperf.gperf | 1 + + src/basic/missing_magic.h | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf +index e8c5357f91461..1cd66b5a5fa99 100644 +--- a/src/basic/filesystems-gperf.gperf ++++ b/src/basic/filesystems-gperf.gperf +@@ -91,6 +91,7 @@ ocfs2, {OCFS2_SUPER_MAGIC} + openpromfs, {OPENPROM_SUPER_MAGIC} + orangefs, {ORANGEFS_DEVREQ_MAGIC} + overlay, {OVERLAYFS_SUPER_MAGIC} ++pidfs, {PID_FS_MAGIC} + pipefs, {PIPEFS_MAGIC} + ppc-cmm, {PPC_CMM_MAGIC} + proc, {PROC_SUPER_MAGIC} +diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h +index 27a33adecb4ed..82d71c8ad1233 100644 +--- a/src/basic/missing_magic.h ++++ b/src/basic/missing_magic.h +@@ -128,6 +128,11 @@ + #define DEVMEM_MAGIC 0x454d444d + #endif + ++/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ ++#ifndef PID_FS_MAGIC ++#define PID_FS_MAGIC 0x50494446 ++#endif ++ + /* Not in mainline but included in Ubuntu */ + #ifndef SHIFTFS_MAGIC + #define SHIFTFS_MAGIC 0x6a656a62 diff --git a/systemd.spec b/systemd.spec index 31d4038..81572ed 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://systemd.io/ Version: 255 -Release: 17 +Release: 18 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -67,6 +67,7 @@ Patch6013: backport-fix-homed-log-message-typo-error.patch Patch6014: backport-bash-completion-add-systemctl-service-log-level-target.patch Patch6015: backport-fix-log-message-not-match-glob-patterns-passed-to-disable-command.patch Patch6016: backport-main-pass-the-right-error-variable.patch +Patch6017: backport-basic-add-missing-PIDFS-magic.patch Patch9008: update-rtc-with-system-clock-when-shutdown.patch Patch9009: udev-add-actions-while-rename-netif-failed.patch @@ -1646,6 +1647,9 @@ fi %{_libdir}/security/pam_systemd_loadkey.so %changelog +* Wed Jul 3 2024 Han Jinpeng - 255-18 +- backport: fix missing PIDFS magic issue when compile + * Tue May 21 2024 dufuhang - 255-17 - main: pass the right error variable -- Gitee