Skip to contentSkip to conversation

package/systemd: Add BCACHEFS superblock magic

PATCH In review Jarkko Sakkinen 3 participants 3 messages Jun 11, 2024 – Jul 28, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/systemd: Add BCACHEFS superblock magic

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-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
package/systemd/0001-basic-add-bcachefs-magic.patch new file +50 -0
new file mode 100644
index 0000000000..ca13067f6a
@@ -0,0 +1,50 @@
+From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001
+From: Chris Packham <[email protected]>
+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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#1 lore raw

Hello Jarkko,

Quoted 10 lines · On Tue, 11 Jun 2024 19:55:39 +0300 Jarkko Sakkinen <[email protected]> wrote:

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")

Thanks for the patch, which I have applied, after fixing a few things, see below.

package/systemd/0001-basic-add-bcachefs-magic.patch line 4

Quoted 10 lines
package/systemd/0001-basic-add-bcachefs-magic.patch new file +4 -0
new file mode 100644
index 0000000000..ca13067f6a
@@ -0,0 +1,50 @@
+From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001
+From: Chris Packham <[email protected]>
+Date: Fri, 31 May 2024 09:51:38 +1200
+Subject: [PATCH 2/2] basic: Add BCACHEFS magic

We don't want the 2/2 in our patches, because it always becomes out of date very quickly.

package/systemd/0001-basic-add-bcachefs-magic.patch line 15

Quoted 11 lines
package/systemd/0001-basic-add-bcachefs-magic.patch new file +11 -0
+
+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
+```

Missing Upstream: tag, missing Signed-off-by: tag.

All 3 issues are reported by "make check-package".

I fixed them when applying your patch to master, and also improved a bit the commit title/message.

Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni via buildroot <[email protected]> writes:

Hello Jarkko,

Quoted 5 lines · On Tue, 11 Jun 2024 19:55:39 +0300 Jarkko Sakkinen <[email protected]> wrote:

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")

Quoted 8 lines
Quoted 5 lines

Thanks for the patch, which I have applied, after fixing a few things, see below.

Committed to 2024.02.x and 2024.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot