diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-04 22:33:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-09 13:44:39 +0100 |
commit | 57933bd958cc06722ab7924ec9dc2c72fadc9693 (patch) | |
tree | 56756a4436b50dc7b2b2bea12625ad88276a88e6 /meta/recipes-connectivity | |
parent | 94123bd09b0d00b1a0ef6a78f74b3c593c8f162d (diff) | |
download | poky-57933bd958cc06722ab7924ec9dc2c72fadc9693.tar.gz |
openssh/util-linux/python*: Ensure ptest output is unbuffered
We need to run sed with the -u option to ensure the output is unbuffered else
ptest-runner may timeout thinkig things were idle. Busybox doesn't have the -u
option so we need to RDEPEND on sed (which is a good thing to do if we use it
anyway).
Alex Kanavin should get credit for discovering the problem.
(From OE-Core rev: d3ffbebf43c23faa43af81c9ecf6fcaef36d675b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.9p1.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 36a3d2a7b7..daf62cca5b 100755 --- a/meta/recipes-connectivity/openssh/openssh/run-ptest +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest | |||
@@ -5,7 +5,7 @@ export TEST_SHELL=sh | |||
5 | cd regress | 5 | cd regress |
6 | sed -i "/\t\tagent-ptrace /d" Makefile | 6 | sed -i "/\t\tagent-ptrace /d" Makefile |
7 | make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ | 7 | make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ |
8 | | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' | 8 | | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' |
9 | 9 | ||
10 | SSHAGENT=`which ssh-agent` | 10 | SSHAGENT=`which ssh-agent` |
11 | GDB=`which gdb` | 11 | GDB=`which gdb` |
diff --git a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb index 2a23f64b89..6260135d5b 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb | |||
@@ -144,7 +144,7 @@ FILES_${PN}-keygen = "${bindir}/ssh-keygen" | |||
144 | 144 | ||
145 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 145 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |
146 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 146 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
147 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" | 147 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed" |
148 | 148 | ||
149 | RPROVIDES_${PN}-ssh = "ssh" | 149 | RPROVIDES_${PN}-ssh = "ssh" |
150 | RPROVIDES_${PN}-sshd = "sshd" | 150 | RPROVIDES_${PN}-sshd = "sshd" |