From: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
Place OE specific openssh setup (which was removed in a previous
patch) in a configuration snippet.
Signed-off-by: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
---
.../openssh/openssh-config.bb | 30 +++++++++++++++++++
.../openssh/openssh-config/80-oe.conf | 5 ++++
.../openssh/openssh_9.6p1.bb | 2 ++
3 files changed, 37 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh-config.bb
create mode 100644 meta/recipes-connectivity/openssh/openssh-config/80-oe.conf
diff --git a/meta/recipes-connectivity/openssh/openssh-config.bb
b/meta/recipes-connectivity/openssh/openssh-config.bb
new file mode 100644
index 000000000000..2ef6a770fcfe
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-config.bb
@@ -0,0 +1,30 @@
+SUMMARY = "OE openssh configuration"
+DESCRIPTION = "Provides openssh configuration snippets which correspond to
IMAGE_FEATURE"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "\
+ file://80-oe.conf \
+"
+
+do_install() {
+ d=${D}${sysconfdir}/ssh/sshd_config.d
+ install -d "$d"
+ install -p -m 0644 \
+ ${WORKDIR}/80-oe.conf \
+ "$d"/
+}
+
+python populate_packages:prepend() {
+ dir = d.expand('${sysconfdir}/ssh/sshd_config.d')
+
+ do_split_packages(d, dir, '^60-(.*)\.conf',
+ output_pattern='${PN}-%s',
+ description="openssh config for '%s' feature",
+ extra_depends='',
+ prepend=True)
+}
+
+PACKAGES_DYNAMIC = "${PN}-*"
+
+FILES:${PN} = "${sysconfdir}/ssh/sshd_config.d/80-oe.conf"
diff --git a/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf
b/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf
new file mode 100644
index 000000000000..9a92d3c8d197
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf
@@ -0,0 +1,5 @@
+KbdInteractiveAuthentication no
+
+Compression no
+ClientAliveInterval 15
+ClientAliveCountMax 4
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index d500ca6019fe..406b349f8283 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
@@ -191,6 +191,8 @@ RCONFLICTS:${PN}-sshd = "dropbear"
CONFFILES:${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
CONFFILES:${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
+RRECOMMENDS:${PN} += "openssh-config"
+
ALTERNATIVE_PRIORITY = "90"
ALTERNATIVE:${PN}-scp = "scp"
ALTERNATIVE:${PN}-ssh = "ssh"
--
2.44.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196953):
https://lists.openembedded.org/g/openembedded-core/message/196953
Mute This Topic: https://lists.openembedded.org/mt/104868001/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
