systemd: refresh patch to remove fuzz introduced by rebase on v252
PATCH 1/2 systemd: refresh patch to remove fuzz introduced by rebase on v252
From: Luca Boccassi <[email protected]>
--- ...binfmt-Don-t-install-dependency-links-at-install-tim.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +2 -2
@@ -29,7 +29,7 @@ diff --git a/units/meson.build b/units/meson.build index a9bf28f6d9..11d3644168 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -63,8 +63,7 @@ units = [ +@@ -62,8 +62,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],
@@ -64,7 +64,7 @@ diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 96f595ad72..7c010bb224 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +@@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target
Signature · 1 line
2.34.1
PATCH 2/2 systemd: ship pcrphase/measure tools and units in systemd-extra-utils
From: Luca Boccassi <[email protected]>
New tooling related to signed TPM policies introduced in v252
--- meta/recipes-core/systemd/systemd_252.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/recipes-core/systemd/systemd_252.4.bb +8 -0
@@ -527,12 +527,15 @@ FILES_${PN}-extra-utils = "\ ${bindir}/systemd-stdio-bridge \ ${base_bindir}/systemd-ask-password \ ${base_bindir}/systemd-tty-ask-password-agent \ + ${systemd_unitdir}/system/initrd.target.wants/systemd-pcrphase-initrd.path \ ${systemd_unitdir}/system/systemd-ask-password-console.path \ ${systemd_unitdir}/system/systemd-ask-password-console.service \ ${systemd_unitdir}/system/systemd-ask-password-wall.path \ ${systemd_unitdir}/system/systemd-ask-password-wall.service \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-pcrphase.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-pcrphase-sysinit.path \ ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ ${rootlibexecdir}/systemd/systemd-resolve-host \ ${rootlibexecdir}/systemd/systemd-ac-power \
@@ -540,12 +543,17 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_unitdir}/system/systemd-bus-proxyd.service \ ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ + ${rootlibexecdir}/systemd/systemd-measure \ + ${rootlibexecdir}/systemd/systemd-pcrphase \ ${rootlibexecdir}/systemd/systemd-socket-proxyd \ ${rootlibexecdir}/systemd/systemd-reply-password \ ${rootlibexecdir}/systemd/systemd-sleep \ ${rootlibexecdir}/systemd/system-sleep \ ${systemd_unitdir}/system/systemd-hibernate.service \ ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ + ${systemd_unitdir}/system/systemd-pcrphase-initrd.service \ + ${systemd_unitdir}/system/systemd-pcrphase.service \ + ${systemd_unitdir}/system/systemd-pcrphase-sysinit.service \ ${systemd_unitdir}/system/systemd-suspend.service \ ${systemd_unitdir}/system/sleep.target \ ${rootlibexecdir}/systemd/systemd-initctl \
Signature · 1 line
2.34.1
Re: [OE-core] [PATCH 2/2] systemd: ship pcrphase/measure tools and units in systemd-extra-utils
Hello,
This doesn't apply on master because of 5ace3ada5c54 ("systemd:
'${systemd_unitdir}/system' => '${systemd_system_unitdir}'"), can you rebase?
Quoted 60 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
New tooling related to signed TPM policies introduced in v252
Signed-off-by Luca Boccassi <[email protected]>--- meta/recipes-core/systemd/systemd_252.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+)meta/recipes-core/systemd/systemd_252.4.bb +8
-0@@ -527,12 +527,15 @@ FILES_${PN}-extra-utils = "\ ${bindir}/systemd-stdio-bridge \ ${base_bindir}/systemd-ask-password \ ${base_bindir}/systemd-tty-ask-password-agent \ + ${systemd_unitdir}/system/initrd.target.wants/systemd-pcrphase-initrd.path \ ${systemd_unitdir}/system/systemd-ask-password-console.path \ ${systemd_unitdir}/system/systemd-ask-password-console.service \ ${systemd_unitdir}/system/systemd-ask-password-wall.path \ ${systemd_unitdir}/system/systemd-ask-password-wall.service \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-pcrphase.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-pcrphase-sysinit.path \ ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ ${rootlibexecdir}/systemd/systemd-resolve-host \ ${rootlibexecdir}/systemd/systemd-ac-power \@@ -540,12 +543,17 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_unitdir}/system/systemd-bus-proxyd.service \ ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ + ${rootlibexecdir}/systemd/systemd-measure \ + ${rootlibexecdir}/systemd/systemd-pcrphase \ ${rootlibexecdir}/systemd/systemd-socket-proxyd \ ${rootlibexecdir}/systemd/systemd-reply-password \ ${rootlibexecdir}/systemd/systemd-sleep \ ${rootlibexecdir}/systemd/system-sleep \ ${systemd_unitdir}/system/systemd-hibernate.service \ ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ + ${systemd_unitdir}/system/systemd-pcrphase-initrd.service \ + ${systemd_unitdir}/system/systemd-pcrphase.service \ + ${systemd_unitdir}/system/systemd-pcrphase-sysinit.service \ ${systemd_unitdir}/system/systemd-suspend.service \ ${systemd_unitdir}/system/sleep.target \ ${rootlibexecdir}/systemd/systemd-initctl \Signature · 11 lines
2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175725): https://lists.openembedded.org/g/openembedded-core/message/175725 Mute This Topic: https://lists.openembedded.org/mt/96188492/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 2/2] systemd: ship pcrphase/measure tools and units in systemd-extra-utils
Quoted 6 lines · Alexandre Belloni
Hello,
This doesn't apply on master because of
5ace3ada5c54("systemd:
'${systemd_unitdir}/system' => '${systemd_system_unitdir}'"), can you rebase?
Agh sorry about that, sent from the wrong branch. v2 sent just now.
Kind regards,
Luca Boccassi
PATCH v2 1/2 systemd: refresh patch to remove fuzz introduced by rebase on v252
In reply to [email protected]From: Luca Boccassi <[email protected]>
--- ...binfmt-Don-t-install-dependency-links-at-install-tim.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +2 -2
@@ -29,7 +29,7 @@ diff --git a/units/meson.build b/units/meson.build index a9bf28f6d9..11d3644168 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -63,8 +63,7 @@ units = [ +@@ -62,8 +62,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],
@@ -64,7 +64,7 @@ diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 96f595ad72..7c010bb224 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +@@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target
Signature · 1 line
2.34.1
PATCH v2 2/2 systemd: ship pcrphase/measure tools and units in systemd-extra-utils
From: Luca Boccassi <[email protected]>
New tooling related to signed TPM policies introduced in v252
---
v2: rebase to use systemd_system_unitdir
meta/recipes-core/systemd/systemd_252.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/recipes-core/systemd/systemd_252.4.bb +8 -0
@@ -529,12 +529,15 @@ FILES:${PN}-extra-utils = "\ ${bindir}/systemd-stdio-bridge \ ${base_bindir}/systemd-ask-password \ ${base_bindir}/systemd-tty-ask-password-agent \ + ${systemd_system_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.path \ ${systemd_system_unitdir}/systemd-ask-password-console.path \ ${systemd_system_unitdir}/systemd-ask-password-console.service \ ${systemd_system_unitdir}/systemd-ask-password-wall.path \ ${systemd_system_unitdir}/systemd-ask-password-wall.service \ ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-console.path \ ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-wall.path \ + ${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase.path \ + ${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.path \ ${systemd_system_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path \ ${rootlibexecdir}/systemd/systemd-resolve-host \ ${rootlibexecdir}/systemd/systemd-ac-power \
@@ -542,12 +545,17 @@ FILES:${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_system_unitdir}/systemd-bus-proxyd.service \ ${systemd_system_unitdir}/systemd-bus-proxyd.socket \ + ${rootlibexecdir}/systemd/systemd-measure \ + ${rootlibexecdir}/systemd/systemd-pcrphase \ ${rootlibexecdir}/systemd/systemd-socket-proxyd \ ${rootlibexecdir}/systemd/systemd-reply-password \ ${rootlibexecdir}/systemd/systemd-sleep \ ${rootlibexecdir}/systemd/system-sleep \ ${systemd_system_unitdir}/systemd-hibernate.service \ ${systemd_system_unitdir}/systemd-hybrid-sleep.service \ + ${systemd_system_unitdir}/systemd-pcrphase-initrd.service \ + ${systemd_system_unitdir}/systemd-pcrphase.service \ + ${systemd_system_unitdir}/systemd-pcrphase-sysinit.service \ ${systemd_system_unitdir}/systemd-suspend.service \ ${systemd_system_unitdir}/sleep.target \ ${rootlibexecdir}/systemd/systemd-initctl \
Signature · 1 line
2.34.1