From: Antonin Godard <antonin.godard@bootlin.com>
Date: Fri, 6 Feb 2026 08:49:56 +0000 (+0100)
Subject: openssh: replace hardcoded paths by standard paths
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61faf2f4f6d63350efdaca76364089939af4364f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

openssh: replace hardcoded paths by standard paths

Use common definitions from bitbake.conf instead of hardcoded values for
OPENSSH_HOST_KEY_DIR and OPENSSH_HOST_KEY_DIR_READONLY_CONFIG.

Fixes: addd80ddfd89 ("openssh: add variable for key path")
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/openssh/openssh_10.2p1.bb b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
index d8ea487ae3a..929c9e4b9fb 100644
--- a/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
@@ -100,8 +100,8 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
 CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no"
 
 # This allows overriding the key location
-OPENSSH_HOST_KEY_DIR_READONLY_CONFIG ?= "/var/run/ssh"
-OPENSSH_HOST_KEY_DIR ?= "/etc/ssh"
+OPENSSH_HOST_KEY_DIR_READONLY_CONFIG ?= "${localstatedir}/run/ssh"
+OPENSSH_HOST_KEY_DIR ?= "${sysconfdir}/ssh"
 
 do_configure:prepend () {
 	export LD="${CC}"