summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_9.1p1.bb9
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_9.1p1.bb b/meta/recipes-connectivity/openssh/openssh_9.1p1.bb
index 85f97b1bbb..23ae8d5b0c 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.1p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.1p1.bb
@@ -52,15 +52,12 @@ SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket"
52 52
53inherit autotools-brokensep ptest 53inherit autotools-brokensep ptest
54 54
55PACKAGECONFIG ??= "rng-tools" 55PACKAGECONFIG ??= ""
56PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" 56PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
57PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" 57PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
58PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" 58PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
59PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat" 59PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
60 60
61# Add RRECOMMENDS to rng-tools for sshd package
62PACKAGECONFIG[rng-tools] = ""
63
64EXTRA_AUTORECONF += "--exclude=aclocal" 61EXTRA_AUTORECONF += "--exclude=aclocal"
65 62
66# login path is hardcoded in sshd 63# login path is hardcoded in sshd
@@ -160,10 +157,6 @@ FILES:${PN}-keygen = "${bindir}/ssh-keygen"
160 157
161RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" 158RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server"
162RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" 159RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
163RRECOMMENDS:${PN}-sshd:append:class-target = "\
164 ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \
165"
166
167# gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies 160# gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies
168RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" 161RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils"
169 162