diff options
| author | Ross Burton <ross.burton@arm.com> | 2025-04-22 20:00:52 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-23 19:52:58 +0100 |
| commit | 576c4fd9e0b571c3ee37f67f25a51fe68466eac3 (patch) | |
| tree | 2741547a28ece9e6b0768930e3624836d9d50e0f | |
| parent | 11a005cae73719f623ba4e55284bd9764aa10e5c (diff) | |
| download | poky-576c4fd9e0b571c3ee37f67f25a51fe68466eac3.tar.gz | |
systemd: always depend on the explicit serial console units
The systemd-serialgetty recipe generates explicit units for consoles
that are defined in SERIAL_CONSOLES, and if that variable is not defined
then just produces an empty package.
Even when systemd has been configured to use the getty generator, if
there are explicit consoles defined then we should respect them. Don't
conditionalise the dependency on systemd-serialgetty so that we always
pull in the explicit consoles.
(From OE-Core rev: a7036173acdb84d516f17257e02a936f04c584d8)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd_257.5.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_257.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index de2f6ffc32..2a18445eba 100644 --- a/meta/recipes-core/systemd/systemd_257.5.bb +++ b/meta/recipes-core/systemd/systemd_257.5.bb | |||
| @@ -754,7 +754,7 @@ FILES:${PN} = " ${base_bindir}/* \ | |||
| 754 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" | 754 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |
| 755 | 755 | ||
| 756 | RDEPENDS:${PN} += "kmod ${VIRTUAL-RUNTIME_dbus} util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap" | 756 | RDEPENDS:${PN} += "kmod ${VIRTUAL-RUNTIME_dbus} util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap" |
| 757 | RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" | 757 | RDEPENDS:${PN} += "systemd-serialgetty" |
| 758 | RDEPENDS:${PN} += "volatile-binds" | 758 | RDEPENDS:${PN} += "volatile-binds" |
| 759 | 759 | ||
| 760 | RRECOMMENDS:${PN} += "${PN}-extra-utils \ | 760 | RRECOMMENDS:${PN} += "${PN}-extra-utils \ |
