Message ID | 20230110222227.314983-2-luca.boccassi@gmail.com |
---|---|
State | New |
Headers | show |
Series | [1/2] systemd: refresh patch to remove fuzz introduced by rebase on v252 | expand |
Hello, This doesn't apply on master because of 5ace3ada5c54 ("systemd: '${systemd_unitdir}/system' => '${systemd_system_unitdir}'"), can you rebase? On 10/01/2023 22:22:27+0000, Luca Bocassi wrote: > From: Luca Boccassi <luca.boccassi@microsoft.com> > > New tooling related to signed TPM policies introduced in v252 > > Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> > --- > meta/recipes-core/systemd/systemd_252.4.bb | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/meta/recipes-core/systemd/systemd_252.4.bb b/meta/recipes-core/systemd/systemd_252.4.bb > index d745d60fe6..fa9c709293 100644 > --- a/meta/recipes-core/systemd/systemd_252.4.bb > +++ b/meta/recipes-core/systemd/systemd_252.4.bb > @@ -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 \ > -- > 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: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, 11 Jan 2023 at 11:21, Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > 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
diff --git a/meta/recipes-core/systemd/systemd_252.4.bb b/meta/recipes-core/systemd/systemd_252.4.bb index d745d60fe6..fa9c709293 100644 --- a/meta/recipes-core/systemd/systemd_252.4.bb +++ b/meta/recipes-core/systemd/systemd_252.4.bb @@ -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 \