From 96caf05219274d6a192f0535c77955b6f356fe7a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 4 Aug 2023 16:29:36 +0100
Subject: [PATCH] systemd: set correct paths for kdb binaries

The kbd binaries (loadkeys and setfont) are installed to bindir, not
base_bindir.

Fixes: 94ccc7acc4a871f5bb7ab8e135e70b5519eff6ad
(From OE-Core rev: 458fdd085beb14572e5a1ed0f94861cf10648725)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/systemd/systemd_254.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_254.bb b/meta/recipes-core/systemd/systemd_254.bb
index ea1a4f02f0..3dd949e69c 100644
--- a/meta/recipes-core/systemd/systemd_254.bb
+++ b/meta/recipes-core/systemd/systemd_254.bb
@@ -252,8 +252,8 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
                   -Dsulogin-path=${base_sbindir}/sulogin \
                   -Dnologin-path=${base_sbindir}/nologin \
                   -Dumount-path=${base_bindir}/umount \
-                  -Dloadkeys-path=${base_bindir}/loadkeys \
-                  -Dsetfont-path=${base_bindir}/setfont"
+                  -Dloadkeys-path=${bindir}/loadkeys \
+                  -Dsetfont-path=${bindir}/setfont"
 
 # The 60 seconds is watchdog's default vaule.
 WATCHDOG_TIMEOUT ??= "60"