diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_9.4p1.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index 1e6eec5799..b2244d725a 100755 --- a/meta/recipes-connectivity/openssh/openssh/run-ptest +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest | |||
@@ -19,7 +19,7 @@ output_failed_logs() { | |||
19 | trap output_failed_logs 0 | 19 | trap output_failed_logs 0 |
20 | 20 | ||
21 | sed -i "/\t\tagent-ptrace /d" Makefile | 21 | sed -i "/\t\tagent-ptrace /d" Makefile |
22 | make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ | 22 | make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="" tests \ |
23 | | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' | 23 | | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' |
24 | 24 | ||
25 | SSHAGENT=`which ssh-agent` | 25 | SSHAGENT=`which ssh-agent` |
diff --git a/meta/recipes-connectivity/openssh/openssh_9.4p1.bb b/meta/recipes-connectivity/openssh/openssh_9.4p1.bb index a38d9c2b81..e2508aa63a 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.4p1.bb | |||
@@ -158,7 +158,7 @@ FILES:${PN}-keygen = "${bindir}/ssh-keygen" | |||
158 | RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" | 158 | RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" |
159 | RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 159 | RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
160 | # 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 |
161 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils openssl-bin" | 161 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed coreutils openssl-bin" |
162 | 162 | ||
163 | RPROVIDES:${PN}-ssh = "ssh" | 163 | RPROVIDES:${PN}-ssh = "ssh" |
164 | RPROVIDES:${PN}-sshd = "sshd" | 164 | RPROVIDES:${PN}-sshd = "sshd" |