From: Luca Boccassi <luca.bocca...@microsoft.com> Signed-off-by: Luca Boccassi <luca.bocca...@microsoft.com> --- NOTE: I do not use musl, so I have not touched those patches
.../{systemd-boot_251.4.bb => systemd-boot_252.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 ++-- ...t-Don-t-install-dependency-links-at-install-tim.patch | 4 ++-- .../systemd/{systemd_251.4.bb => systemd_252.bb} | 9 +++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_251.4.bb => systemd-boot_252.bb} (100%) rename meta/recipes-core/systemd/{systemd_251.4.bb => systemd_252.bb} (98%) diff --git a/meta/recipes-core/systemd/systemd-boot_251.4.bb b/meta/recipes-core/systemd/systemd-boot_252.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_251.4.bb rename to meta/recipes-core/systemd/systemd-boot_252.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 71eb93f23a2..fbaef910af7 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,8 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "2a674b4b66af1a050a0362b646d2fca90c90112e" -SRCBRANCH = "v251-stable" +SRCREV = "e8dc52766e1fdb4f8c09c3ab654d1270e1090c8d" +SRCBRANCH = "v252-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ " diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index a19a0255591..2a033b134e1 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -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 diff --git a/meta/recipes-core/systemd/systemd_251.4.bb b/meta/recipes-core/systemd/systemd_252.bb similarity index 98% rename from meta/recipes-core/systemd/systemd_251.4.bb rename to meta/recipes-core/systemd/systemd_252.bb index 87668cadc75..7c929c22e0f 100644 --- a/meta/recipes-core/systemd/systemd_251.4.bb +++ b/meta/recipes-core/systemd/systemd_252.bb @@ -526,12 +526,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 \ @@ -539,12 +542,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 \ @@ -614,6 +622,7 @@ FILES:${PN} = " ${base_bindir}/* \ ${bindir}/timedatectl \ ${bindir}/bootctl \ ${bindir}/oomctl \ + ${bindir}/userdbctl \ ${exec_prefix}/lib/tmpfiles.d/*.conf \ ${exec_prefix}/lib/systemd \ ${exec_prefix}/lib/modules-load.d \ -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172622): https://lists.openembedded.org/g/openembedded-core/message/172622 Mute This Topic: https://lists.openembedded.org/mt/94753667/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-