[Buildroot] [PATCH] package/systemd: Add BCACHEFS superblock magic

* [Buildroot] [PATCH] package/systemd: Add BCACHEFS superblock magic
@ 2024-06-11 16:55 Jarkko Sakkinen
  2024-07-11 22:28 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Sakkinen @ 2024-06-11 16:55 UTC (permalink / raw)
  To: buildroot; +Cc: Jarkko Sakkinen, Norbert Lange, Yann E . MORIN, Sen Hastings

Add the magic number for the bcachefs superblock. Otherwise, systemd
254.13 fails to compile with the latest kernel versions.

Upstream commit ID:  201148b08de6 ("basic: Add BCACHEFS magic")

Cc: Norbert Lange <nolange79@gmail.com>
Cc: Sen Hastings <sen@hastings.org>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Link: https://social.kernel.org/notice/Aie4Z8s4zYztoFTWUq
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
Cc-list picked from DEVELOPERS with the associated package mentioned.
 .../0001-basic-add-bcachefs-magic.patch       | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/systemd/0001-basic-add-bcachefs-magic.patch

diff --git a/package/systemd/0001-basic-add-bcachefs-magic.patch b/package/systemd/0001-basic-add-bcachefs-magic.patch
new file mode 100644
index 0000000000..ca13067f6a
--- /dev/null
+++ b/package/systemd/0001-basic-add-bcachefs-magic.patch
@@ -0,0 +1,50 @@
+From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Fri, 31 May 2024 09:51:38 +1200
+Subject: [PATCH 2/2] basic: Add BCACHEFS magic
+
+Import magic.h from Linux 6.9 to get the definition of
+BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of
+bcachefs.
+
+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: BCACHEFS_SUPER_MAGIC
+```
+---
+ src/basic/filesystems-gperf.gperf | 1 +
+ src/basic/missing_magic.h         | 7 +++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf
+index 1cd66b5a5f..c82fe98227 100644
+--- a/src/basic/filesystems-gperf.gperf
++++ b/src/basic/filesystems-gperf.gperf
+@@ -28,6 +28,7 @@ afs,             {AFS_FS_MAGIC, AFS_SUPER_MAGIC}
+ anon_inodefs,    {ANON_INODE_FS_MAGIC}
+ autofs,          {AUTOFS_SUPER_MAGIC}
+ balloon-kvm,     {BALLOON_KVM_MAGIC}
++bcachefs,        {BCACHEFS_SUPER_MAGIC}
+ bdev,            {BDEVFS_MAGIC}
+ binder,          {BINDERFS_SUPER_MAGIC}
+ binfmt_misc,     {BINFMTFS_MAGIC}
+diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
+index 82d71c8ad1..b3d2ee9f57 100644
+--- a/src/basic/missing_magic.h
++++ b/src/basic/missing_magic.h
+@@ -197,3 +197,10 @@
+ #ifndef NTFS3_SUPER_MAGIC
+ #define NTFS3_SUPER_MAGIC 0x7366746e
+ #endif
++
++/* Added in Linux commit e2f48c48090dea172c0c571101041de64634dae5. Remove when next sync'd */
++#ifndef BCACHEFS_SUPER_MAGIC
++#  define BCACHEFS_SUPER_MAGIC 0xca451a4e
++#else
++assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e)
++#endif
+--
+2.45.1
+
--
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread