From: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
Instead of applying DISTRO_FEATURE based setup directly to
sshd_config, add it to our configuration snippet.
Signed-off-by: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
---
meta/recipes-connectivity/openssh/openssh-config.bb | 10 ++++++++++
meta/recipes-connectivity/openssh/openssh_9.6p1.bb | 8 --------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh-config.bb
b/meta/recipes-connectivity/openssh/openssh-config.bb
index 2ef6a770fcfe..312a1c903f63 100644
--- a/meta/recipes-connectivity/openssh/openssh-config.bb
+++ b/meta/recipes-connectivity/openssh/openssh-config.bb
@@ -13,6 +13,16 @@ do_install() {
install -p -m 0644 \
${WORKDIR}/80-oe.conf \
"$d"/
+
+ f=$d/80-oe.conf
+
+ if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
+ echo "UsePAM yes" >> "$f"
+ fi
+
+ if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+ echo "X11Forwarding yes" >> "$f"
+ fi
}
python populate_packages:prepend() {
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index 406b349f8283..e792b459d838 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
@@ -109,11 +109,6 @@ do_compile_ptest() {
do_install:append () {
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
- sed -i -e 's:#UsePAM no:UsePAM yes:'
${D}${sysconfdir}/ssh/sshd_config
- fi
-
- if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
- sed -i -e 's:#X11Forwarding no:X11Forwarding yes:'
${D}${sysconfdir}/ssh/sshd_config
fi
install -d ${D}${sysconfdir}/init.d
@@ -188,9 +183,6 @@ RPROVIDES:${PN}-sshd = "sshd"
RCONFLICTS:${PN} = "dropbear"
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"
--
2.44.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196954):
https://lists.openembedded.org/g/openembedded-core/message/196954
Mute This Topic: https://lists.openembedded.org/mt/104868002/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
