* [Buildroot] [PATCH v2 0/3] Upgrade systemd to v255
@ 2024-06-06 10:48 Jarkko Sakkinen
2024-06-06 10:48 ` [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 Jarkko Sakkinen
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Jarkko Sakkinen @ 2024-06-06 10:48 UTC (permalink / raw)
To: buildroot
Cc: Jarkko Sakkinen, Erik Larsson, Thomas Petazzoni, James Hilliard,
Yann E . MORIN, Stefan Berger
The goal here is to upgrade systemd version to v255, which is the final
version version with sysvinit compatibility. I also cherry-picked couple of
bug fixes from the systemd upstream, which address errors complaining of
missing superblocks:
1. Filesystem found in kernel header but not in \
filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC
1. Filesystem found in kernel header but not in \
filesystems-gperf.gperf: PID_FS_MAGIC
On feature side v255 has a nice tool called 'systemd-pcrlock', which can
be used for creating and experimenting with TPM2 authorization policies,
which is very useful.
I also upgraded tpm2-tools to 5.7 because it has a useful conversion
tool called 'tpm2_encodeobject".
Change Log
==========
v1: https://lists.buildroot.org/pipermail/buildroot/2024-June/754748.html
Cc: buildroot@buildroot.org.
Cc: James Hilliard <james.hilliard1@gmail.com>
CC: Arnout Vandecappelle <arnout@mind.be>
Cc: Erik Larsson <karl.erik.larsson@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Jarkko Sakkinen (3):
package/tpm2-tools: bump version to 5.7
package/systemd: bump to version 255
package/systemd: add the missing superblock identifiers
.../0001-basic-add-pidfs-magic-31709.patch | 50 +++++++++++++++++++
.../0002-basic-add-bcachefs-magic.patch | 50 +++++++++++++++++++
package/systemd/systemd.hash | 2 +-
package/systemd/systemd.mk | 2 +-
package/tpm2-tools/tpm2-tools.hash | 2 +-
package/tpm2-tools/tpm2-tools.mk | 2 +-
6 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 package/systemd/0001-basic-add-pidfs-magic-31709.patch
create mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 2024-06-06 10:48 [Buildroot] [PATCH v2 0/3] Upgrade systemd to v255 Jarkko Sakkinen @ 2024-06-06 10:48 ` Jarkko Sakkinen 2024-06-06 11:52 ` Yann E. MORIN 2024-06-06 10:48 ` [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers Jarkko Sakkinen 2 siblings, 1 reply; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 10:48 UTC (permalink / raw) To: buildroot Cc: Erik Larsson, Jarkko Sakkinen, Erik Larsson, Thomas Petazzoni, James Hilliard, Yann E . MORIN, Stefan Berger tpm2_encodeobject is essential for testing RSAPKCS1 and ECDSA TPM2 signing keys, as the key blob is loaded to the chip in DER format defined by ASN.1 schema. Link: https://lore.kernel.org/linux-crypto/20240528210823.28798-1-jarkko@kernel.org/ Cc: Erik Larsson <who+buildroot@cnackers.org> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index f50a896363..a7b1ef559e 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz +sha256 3810d36b5079256f4f2f7ce552e22213d43b1031c131538df8a2dbc3c570983a tpm2-tools-5.7.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 12f924eee5..cd9c582aa9 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 5.2 +TPM2_TOOLS_VERSION = 5.7 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE -- 2.45.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 2024-06-06 10:48 ` [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 Jarkko Sakkinen @ 2024-06-06 11:52 ` Yann E. MORIN 0 siblings, 0 replies; 11+ messages in thread From: Yann E. MORIN @ 2024-06-06 11:52 UTC (permalink / raw) To: Jarkko Sakkinen Cc: Erik Larsson, James Hilliard, Erik Larsson, Thomas Petazzoni, buildroot, Stefan Berger Jarkko, All, On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > tpm2_encodeobject is essential for testing RSAPKCS1 and ECDSA TPM2 signing > keys, as the key blob is loaded to the chip in DER format defined by ASN.1 > schema. > > Link: https://lore.kernel.org/linux-crypto/20240528210823.28798-1-jarkko@kernel.org/ > Cc: Erik Larsson <who+buildroot@cnackers.org> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index f50a896363..a7b1ef559e 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > +sha256 3810d36b5079256f4f2f7ce552e22213d43b1031c131538df8a2dbc3c570983a tpm2-tools-5.7.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE make tpm2-tools-legal-info >>> tpm2-tools 5.7 Collecting legal info sha256sum: /home/ymorin/dev/buildroot/O/next/build/tpm2-tools-5.7/doc/LICENSE: No such file or directory ERROR: while checking hashes from package/tpm2-tools/tpm2-tools.hash ERROR: doc/LICENSE has wrong sha256 hash: ERROR: expected: f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack make[1]: *** [package/tpm2-tools/tpm2-tools.mk:31: tpm2-tools-legal-info] Error 1 make: *** [Makefile:23: _all] Error 2 The doc/ directory has been renamed docs/ so I also fixed that for the LICENSE file. Applied to next, thanks. Regards, Yann E. MORIN. > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 12f924eee5..cd9c582aa9 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 5.2 > +TPM2_TOOLS_VERSION = 5.7 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > -- > 2.45.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 2024-06-06 10:48 [Buildroot] [PATCH v2 0/3] Upgrade systemd to v255 Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 Jarkko Sakkinen @ 2024-06-06 10:48 ` Jarkko Sakkinen 2024-06-06 11:09 ` Yann E. MORIN 2024-06-06 10:48 ` [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers Jarkko Sakkinen 2 siblings, 1 reply; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 10:48 UTC (permalink / raw) To: buildroot Cc: Jarkko Sakkinen, Erik Larsson, Thomas Petazzoni, James Hilliard, Yann E . MORIN, Stefan Berger The last version with System V init scripts and cgroups v1 support. After this version the upgrade will take mostly a longer period of time. Link: https://github.com/systemd/systemd/releases/tag/v255 Cc: James Hilliard <james.hilliard1@gmail.com> Cd: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f999d0d34e..190e326e57 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 26ac73c2108132b1d11ff939e8b1bece42f1c1da03fdf4a242af5a7cf3ac34f1 systemd-254.13.tar.gz +sha256 a3eb766ee96eb9f4cc25c2a6c933f3299e1b7ae22e72507dade0a5c86d92534f systemd-255.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6b3553723c..e74eb9e830 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.13 +SYSTEMD_VERSION = 255 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.45.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 2024-06-06 10:48 ` [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 Jarkko Sakkinen @ 2024-06-06 11:09 ` Yann E. MORIN 2024-06-06 12:17 ` Jarkko Sakkinen 0 siblings, 1 reply; 11+ messages in thread From: Yann E. MORIN @ 2024-06-06 11:09 UTC (permalink / raw) To: Jarkko Sakkinen Cc: Stefan Berger, James Hilliard, Erik Larsson, Thomas Petazzoni, buildroot Karkko, All, On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > The last version with System V init scripts As far as I know, in Buildroot we do not use that compatibility layer, as we do pass the followign option at build: -Dsysvinit-path= So we should not be impacted by that removal, correct? > and cgroups v1 support. It's not entirely clear to me how dropping cgroups v1 suport will be impactful... AFAIK, the kernel has long had cgroups v2, so virtually all systems where we would deply systemd 256+ would have a recent-enough kernel. > After > this version the upgrade will take mostly a longer period of time. > > Link: https://github.com/systemd/systemd/releases/tag/v255 > Cc: James Hilliard <james.hilliard1@gmail.com> > Cd: Arnout Vandecappelle <arnout@mind.be> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > --- [--SNIP--] > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 6b3553723c..e74eb9e830 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -19,7 +19,7 @@ > # - Diff sysusers.d with the previous version > # - Diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) Did you address the comments above? If so, can you elaborate (even slightly) in the commit log why nothing changed in those respects, please? Regards, Yann E. MORIN. > -SYSTEMD_VERSION = 254.13 > +SYSTEMD_VERSION = 255 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ > -- > 2.45.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 2024-06-06 11:09 ` Yann E. MORIN @ 2024-06-06 12:17 ` Jarkko Sakkinen 0 siblings, 0 replies; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 12:17 UTC (permalink / raw) To: Yann E. MORIN Cc: Stefan Berger, James Hilliard, Erik Larsson, Thomas Petazzoni, buildroot On Thu Jun 6, 2024 at 2:09 PM EEST, Yann E. MORIN wrote: > Karkko, All, > > On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > > The last version with System V init scripts > > As far as I know, in Buildroot we do not use that compatibility layer, > as we do pass the followign option at build: -Dsysvinit-path= Good to know. > > So we should not be impacted by that removal, correct? Yes. > > > and cgroups v1 support. > > It's not entirely clear to me how dropping cgroups v1 suport will be > impactful... AFAIK, the kernel has long had cgroups v2, so virtually all > systems where we would deply systemd 256+ would have a recent-enough > kernel. Yes. And aforementioned *pcrlock is not crucially important. BR, Jarkko _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers 2024-06-06 10:48 [Buildroot] [PATCH v2 0/3] Upgrade systemd to v255 Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 Jarkko Sakkinen @ 2024-06-06 10:48 ` Jarkko Sakkinen 2024-06-06 11:03 ` Yann E. MORIN 2024-06-06 11:14 ` Yann E. MORIN 2 siblings, 2 replies; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 10:48 UTC (permalink / raw) To: buildroot Cc: Jarkko Sakkinen, Erik Larsson, Thomas Petazzoni, James Hilliard, Yann E . MORIN, Stefan Berger The following superblock identifiers are missing: 1. BCACHEFS_SUPER_MAGIC 2. PID_FS_MAGIC In my testing at least Linux 6.{9,10} have failed to compile because of this. Cherry-pick upstream fixes, which address them. Link: https://social.kernel.org/notice/Aie4Z8s4zYztoFTWUq Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- .../0001-basic-add-pidfs-magic-31709.patch | 50 +++++++++++++++++++ .../0002-basic-add-bcachefs-magic.patch | 50 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 package/systemd/0001-basic-add-pidfs-magic-31709.patch create mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch diff --git a/package/systemd/0001-basic-add-pidfs-magic-31709.patch b/package/systemd/0001-basic-add-pidfs-magic-31709.patch new file mode 100644 index 0000000000..683f91dbb7 --- /dev/null +++ b/package/systemd/0001-basic-add-pidfs-magic-31709.patch @@ -0,0 +1,50 @@ +From 5cffe2484bbc6ec4b5b721094936f510a81c5167 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 1/2] 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 e8c5357f91..1cd66b5a5f 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 27a33adecb..82d71c8ad1 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 +-- +2.45.1 + diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch new file mode 100644 index 0000000000..ca13067f6a --- /dev/null +++ b/package/systemd/0002-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.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers 2024-06-06 10:48 ` [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers Jarkko Sakkinen @ 2024-06-06 11:03 ` Yann E. MORIN 2024-06-06 12:11 ` Jarkko Sakkinen 2024-06-06 11:14 ` Yann E. MORIN 1 sibling, 1 reply; 11+ messages in thread From: Yann E. MORIN @ 2024-06-06 11:03 UTC (permalink / raw) To: Jarkko Sakkinen Cc: Stefan Berger, James Hilliard, Erik Larsson, Thomas Petazzoni, buildroot Jarkko, All, On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > The following superblock identifiers are missing: > 1. BCACHEFS_SUPER_MAGIC > 2. PID_FS_MAGIC Does that already happen with systemd 254? - if yes, then this change should be sent before the version bump: first, bug fixes, then new features; - if not, then this patch should be included in the patch that does the version bump, otherwise the version bump by itself is broken. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers 2024-06-06 11:03 ` Yann E. MORIN @ 2024-06-06 12:11 ` Jarkko Sakkinen 0 siblings, 0 replies; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 12:11 UTC (permalink / raw) To: Yann E. MORIN Cc: James Hilliard, Erik Larsson, buildroot, Thomas Petazzoni, Stefan Berger On Thu Jun 6, 2024 at 2:03 PM EEST, Yann E. MORIN wrote: > Jarkko, All, > > On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > > The following superblock identifiers are missing: > > 1. BCACHEFS_SUPER_MAGIC > > 2. PID_FS_MAGIC > > Does that already happen with systemd 254? > > - if yes, then this change should be sent before the version bump: > first, bug fixes, then new features; > - if not, then this patch should be included in the patch that does > the version bump, otherwise the version bump by itself is broken. Compiling and testing, soon we will find out. > > Regards, > Yann E. MORIN. BR, Jarkko _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers 2024-06-06 10:48 ` [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers Jarkko Sakkinen 2024-06-06 11:03 ` Yann E. MORIN @ 2024-06-06 11:14 ` Yann E. MORIN 2024-06-06 12:19 ` Jarkko Sakkinen 1 sibling, 1 reply; 11+ messages in thread From: Yann E. MORIN @ 2024-06-06 11:14 UTC (permalink / raw) To: Jarkko Sakkinen Cc: Stefan Berger, James Hilliard, Erik Larsson, Thomas Petazzoni, buildroot Jarkko, All, Sorry, I forgot something in the previous review... On 2024-06-06 13:48 +0300, Jarkko Sakkinen spake thusly: > The following superblock identifiers are missing: > 1. BCACHEFS_SUPER_MAGIC > 2. PID_FS_MAGIC [--SNIP--] > diff --git a/package/systemd/0001-basic-add-pidfs-magic-31709.patch b/package/systemd/0001-basic-add-pidfs-magic-31709.patch > new file mode 100644 > index 0000000000..683f91dbb7 > --- /dev/null > +++ b/package/systemd/0001-basic-add-pidfs-magic-31709.patch > @@ -0,0 +1,50 @@ > +From 5cffe2484bbc6ec4b5b721094936f510a81c5167 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 1/2] 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 > +``` You forgot to add an "Upstream:" tag: https://buildroot.org/downloads/manual/manual.html#_additional_patch_documentation Applicalble to both bundled patches. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers 2024-06-06 11:14 ` Yann E. MORIN @ 2024-06-06 12:19 ` Jarkko Sakkinen 0 siblings, 0 replies; 11+ messages in thread From: Jarkko Sakkinen @ 2024-06-06 12:19 UTC (permalink / raw) To: Yann E. MORIN Cc: James Hilliard, Erik Larsson, buildroot, Thomas Petazzoni, Stefan Berger On Thu Jun 6, 2024 at 2:14 PM EEST, Yann E. MORIN wrote: > You forgot to add an "Upstream:" tag: > > https://buildroot.org/downloads/manual/manual.html#_additional_patch_documentation Yep, already found it, all good: "19.4. Additional patch documentation" > > Applicalble to both bundled patches. > > Regards, > Yann E. MORIN. BR, Jarkko _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-06-06 12:20 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-06-06 10:48 [Buildroot] [PATCH v2 0/3] Upgrade systemd to v255 Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 1/3] package/tpm2-tools: bump version to 5.7 Jarkko Sakkinen 2024-06-06 11:52 ` Yann E. MORIN 2024-06-06 10:48 ` [Buildroot] [PATCH v2 2/3] package/systemd: bump to version 255 Jarkko Sakkinen 2024-06-06 11:09 ` Yann E. MORIN 2024-06-06 12:17 ` Jarkko Sakkinen 2024-06-06 10:48 ` [Buildroot] [PATCH v2 3/3] package/systemd: add the missing superblock identifiers Jarkko Sakkinen 2024-06-06 11:03 ` Yann E. MORIN 2024-06-06 12:11 ` Jarkko Sakkinen 2024-06-06 11:14 ` Yann E. MORIN 2024-06-06 12:19 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox