If the getty generator is disabled then it's neater to remove just the
generator tool instead of the unit files as the unit files are still
useful.

Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
 meta/recipes-core/systemd/systemd_257.1.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_257.1.bb 
b/meta/recipes-core/systemd/systemd_257.1.bb
index cdf72a50157..b9f17849671 100644
--- a/meta/recipes-core/systemd/systemd_257.1.bb
+++ b/meta/recipes-core/systemd/systemd_257.1.bb
@@ -287,9 +287,11 @@ do_install() {
                fi
        fi
        install -d ${D}/${base_sbindir}
-       if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 
'false', 'true', d)}; then
-               # Provided by a separate recipe
-               rm ${D}${systemd_system_unitdir}/serial-getty* -f
+
+       if ! ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 
'true', 'false', d)}; then
+               # Remove the serial-getty generator and instead use explicit 
services
+               # created by the systemd-serialgetty recipe
+               find ${D} -name \*getty-generator\* -delete
        fi
 
        # Provide support for initramfs
-- 
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#211365): 
https://lists.openembedded.org/g/openembedded-core/message/211365
Mute This Topic: https://lists.openembedded.org/mt/111169699/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to