Acked-by: Luca Boccassi <bl...@debian.org>

(please don't send to my microsoft email account, it's absolutely rubbish for 
mailing lists and can't use plain text mode)

________________________________
From: Khem Raj <raj.k...@gmail.com>
Sent: 03 August 2023 05:39
To: openembedded-core@lists.openembedded.org 
<openembedded-core@lists.openembedded.org>
Cc: Khem Raj <raj.k...@gmail.com>; Luca Boccassi <luca.bocca...@microsoft.com>
Subject: [PATCH] systemd: Point to target binary paths for loadkeys and setfont

[You don't often get email from raj.k...@gmail.com. Learn why this is important 
at https://aka.ms/LearnAboutSenderIdentification ]

with newer systemd, if not specified, these paths are searched on build
host /usr dir

log.do_configure.2373278:Program /usr/sbin/loadkeys found: YES 
(/usr/sbin/loadkeys)
log.do_configure.2373278:Program /usr/sbin/setfont found: YES 
(/usr/sbin/setfont)

and if build host happens to have kbd installed then it
uses those locations, this would work fine if the assumption between OE
distro and host distro matches but fail otherwise e.g. on archlinux
these binaries are in /usr/sbin but in OE they are in ${base_bindir}

This results in
qemux86-64 systemd-vconsole-setup[211]: /usr/sbin/loadkeys failed with exit 
status 1.

Signed-off-by: Khem Raj <raj.k...@gmail.com>
Cc: Luca Boccassi <luca.bocca...@microsoft.com>
---
 meta/recipes-core/systemd/systemd_254.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_254.bb 
b/meta/recipes-core/systemd/systemd_254.bb
index a4cfc7b1f44..653fd6910d3 100644
--- a/meta/recipes-core/systemd/systemd_254.bb
+++ b/meta/recipes-core/systemd/systemd_254.bb
@@ -241,7 +241,9 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \
                   -Dsystem-gid-max=999 \
                   "

-# Hardcode target binary paths to avoid using paths from sysroot
+# Hardcode target binary paths to avoid using paths from sysroot or worse
+# it pokes for these binaries on build host and encodes that distro assumption
+# into target
 EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
                   -Dkmod-path=${base_bindir}/kmod \
                   -Dmount-path=${base_bindir}/mount \
@@ -249,7 +251,9 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
                   -Dquotaon-path=${sbindir}/quotaon \
                   -Dsulogin-path=${base_sbindir}/sulogin \
                   -Dnologin-path=${base_sbindir}/nologin \
-                  -Dumount-path=${base_bindir}/umount"
+                  -Dumount-path=${base_bindir}/umount \
+                  -Dloadkeys-path=${base_bindir}/loadkeys \
+                  -Dsetfont-path=${base_bindir}/setfont"

 # The 60 seconds is watchdog's default vaule.
 WATCHDOG_TIMEOUT ??= "60"
--
2.41.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#185468): 
https://lists.openembedded.org/g/openembedded-core/message/185468
Mute This Topic: https://lists.openembedded.org/mt/100520616/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