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 d8ea487ae3aa3d4a7065fda293cdda2e25bac2ef..929c9e4b9fb54717ca63c56e1758a4fba5dc7705 100644 (file)
--- 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}"