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:49:06 +0100 |
commit | 185a87256e9bf764d5628c11705449307eb1b1ad (patch) | |
tree | 146874330c269902179ac3953475e3339747ebc8 | |
parent | 22f3616aadb0132714880d1fa8f97c6e4c05c6e5 (diff) | |
download | poky-185a87256e9bf764d5628c11705449307eb1b1ad.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: 6ec2c52b938302b894f119f701ffcf0a847eee85)
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.4.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_257.4.bb b/meta/recipes-core/systemd/systemd_257.4.bb index f90308f0db..5865c017e8 100644 --- a/meta/recipes-core/systemd/systemd_257.4.bb +++ b/meta/recipes-core/systemd/systemd_257.4.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 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 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 \ |