diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.9p1.bb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb index e4446280d9..6057d055f4 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb | |||
| @@ -54,15 +54,12 @@ SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket" | |||
| 54 | 54 | ||
| 55 | inherit autotools-brokensep ptest | 55 | inherit autotools-brokensep ptest |
| 56 | 56 | ||
| 57 | PACKAGECONFIG ??= "rng-tools" | 57 | PACKAGECONFIG ??= "" |
| 58 | PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" | 58 | PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" |
| 59 | PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" | 59 | PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" |
| 60 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" | 60 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" |
| 61 | PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat" | 61 | PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat" |
| 62 | 62 | ||
| 63 | # Add RRECOMMENDS to rng-tools for sshd package | ||
| 64 | PACKAGECONFIG[rng-tools] = "" | ||
| 65 | |||
| 66 | EXTRA_AUTORECONF += "--exclude=aclocal" | 63 | EXTRA_AUTORECONF += "--exclude=aclocal" |
| 67 | 64 | ||
| 68 | # login path is hardcoded in sshd | 65 | # login path is hardcoded in sshd |
| @@ -162,15 +159,10 @@ FILES:${PN}-keygen = "${bindir}/ssh-keygen" | |||
| 162 | 159 | ||
| 163 | RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" | 160 | RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" |
| 164 | RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 161 | RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
| 165 | RRECOMMENDS:${PN}-sshd:append:class-target = "\ | ||
| 166 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ | ||
| 167 | " | ||
| 168 | |||
| 169 | # break dependency on base package for -dev package | 162 | # break dependency on base package for -dev package |
| 170 | # otherwise SDK fails to build as the main openssh and dropbear packages | 163 | # otherwise SDK fails to build as the main openssh and dropbear packages |
| 171 | # conflict with each other | 164 | # conflict with each other |
| 172 | RDEPENDS:${PN}-dev = "" | 165 | RDEPENDS:${PN}-dev = "" |
| 173 | |||
| 174 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies | 166 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies |
| 175 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" | 167 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" |
| 176 | 168 | ||
