diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-05-15 10:44:32 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-21 12:08:04 +0100 |
| commit | 0bd4acbdd4383facd804a44994b1a2f5483800a2 (patch) | |
| tree | 089eba608b02d4569ee92316dce0cf907deb89dd | |
| parent | 1cd1698fbe9d02864865c332b2ab68ce5ab79a4c (diff) | |
| download | poky-0bd4acbdd4383facd804a44994b1a2f5483800a2.tar.gz | |
systemd: fix build against 6.9 libc-headers
When building against the 6.9 linux-libc-headrs the following build
issue was hit:
| Program check-filesystems.sh found: YES (build/tmp/work/cortexa57-poky-linux/systemd/255.4/git/src/basic/check-filesystems.sh)
|
| ../git/src/basic/meson.build:238:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers:
|
| Filesystem found in kernel header but not in filesystems-gperf.gperf: PID_FS_MAGIC
Upstream already has this fixed, so we backport the commit.
(From OE-Core rev: 5a8a116b270d26ce50429aa32f2883a9d2fd1206)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch | 53 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_255.4.bb | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch b/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch new file mode 100644 index 0000000000..dd4be5ed2a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | From ed01b92e1c92871bbd92711f280e2b2d15753f0e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: cpackham-atlnz <85916201+cpackham-atlnz@users.noreply.github.com> | ||
| 3 | Date: Tue, 12 Mar 2024 00:55:36 +1300 | ||
| 4 | Subject: [PATCH] basic: add PIDFS magic (#31709) | ||
| 5 | |||
| 6 | Kernel commit cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b added pidfs. | ||
| 7 | Update filesystems-gperf.gperf and missing_magic.h accordingly. | ||
| 8 | |||
| 9 | This fixes the following error building against a bleeding edge kernel. | ||
| 10 | ``` | ||
| 11 | ../src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: | ||
| 12 | |||
| 13 | Filesystem found in kernel header but not in filesystems-gperf.gperf: PID_FS_MAGIC | ||
| 14 | ``` | ||
| 15 | |||
| 16 | Upstream-Status: Backport [commit ed01b92e1c92871bbd92711f280e2b2d15753f0e] | ||
| 17 | |||
| 18 | --- | ||
| 19 | src/basic/filesystems-gperf.gperf | 1 + | ||
| 20 | src/basic/missing_magic.h | 5 +++++ | ||
| 21 | 2 files changed, 6 insertions(+) | ||
| 22 | |||
| 23 | diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf | ||
| 24 | index e8c5357f91..1cd66b5a5f 100644 | ||
| 25 | --- a/src/basic/filesystems-gperf.gperf | ||
| 26 | +++ b/src/basic/filesystems-gperf.gperf | ||
| 27 | @@ -91,6 +91,7 @@ ocfs2, {OCFS2_SUPER_MAGIC} | ||
| 28 | openpromfs, {OPENPROM_SUPER_MAGIC} | ||
| 29 | orangefs, {ORANGEFS_DEVREQ_MAGIC} | ||
| 30 | overlay, {OVERLAYFS_SUPER_MAGIC} | ||
| 31 | +pidfs, {PID_FS_MAGIC} | ||
| 32 | pipefs, {PIPEFS_MAGIC} | ||
| 33 | ppc-cmm, {PPC_CMM_MAGIC} | ||
| 34 | proc, {PROC_SUPER_MAGIC} | ||
| 35 | diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h | ||
| 36 | index 27a33adecb..82d71c8ad1 100644 | ||
| 37 | --- a/src/basic/missing_magic.h | ||
| 38 | +++ b/src/basic/missing_magic.h | ||
| 39 | @@ -128,6 +128,11 @@ | ||
| 40 | #define DEVMEM_MAGIC 0x454d444d | ||
| 41 | #endif | ||
| 42 | |||
| 43 | +/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ | ||
| 44 | +#ifndef PID_FS_MAGIC | ||
| 45 | +#define PID_FS_MAGIC 0x50494446 | ||
| 46 | +#endif | ||
| 47 | + | ||
| 48 | /* Not in mainline but included in Ubuntu */ | ||
| 49 | #ifndef SHIFTFS_MAGIC | ||
| 50 | #define SHIFTFS_MAGIC 0x6a656a62 | ||
| 51 | -- | ||
| 52 | 2.39.2 | ||
| 53 | |||
diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.4.bb index 62842d43c8..08af221a93 100644 --- a/meta/recipes-core/systemd/systemd_255.4.bb +++ b/meta/recipes-core/systemd/systemd_255.4.bb | |||
| @@ -28,6 +28,7 @@ SRC_URI += " \ | |||
| 28 | file://systemd-pager.sh \ | 28 | file://systemd-pager.sh \ |
| 29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
| 30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ | 30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ |
| 31 | file://0001-basic-add-PIDFS-magic-31709.patch \ | ||
| 31 | " | 32 | " |
| 32 | 33 | ||
| 33 | # patches needed by musl | 34 | # patches needed by musl |
