summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@linaro.org>2023-12-12 16:11:01 +0200
committerSteve Sakoman <steve@sakoman.com>2023-12-15 04:00:33 -1000
commit4761cbe1ee657a37b315f6cf518447d557fd028e (patch)
tree8efbfc99759d4e308e66f7f644e4f8f88f3a9d88
parent8a09f8472ffd8623204a455ecce724c6a707158f (diff)
downloadpoky-4761cbe1ee657a37b315f6cf518447d557fd028e.tar.gz
openssh: drop sudo from ptest dependencies
The tests don't actually need sudo on core-image-ptest-openssh. Based on logs seen in https://bugzilla.yoctoproject.org/show_bug.cgi?id=15178 it seems that socket errors from sudo are creeping into stderr which are failing the banner ptest from openssh. Removing sudo should help removing the stderr messages and possibly cure the banner test failures. (From OE-Core rev: 47e754f483b674b207bfddcc8d4c5d9a3008e102) (From OE-Core rev: bce20153973ceff3ac9fc98b30e726aa6698d8ee) Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rwxr-xr-xmeta/recipes-connectivity/openssh/openssh/run-ptest2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_8.9p1.bb2
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 8a9b770d59..9a406e9b65 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -5,7 +5,7 @@ export SKIP_UNIT=1
5 5
6cd regress 6cd regress
7sed -i "/\t\tagent-ptrace /d" Makefile 7sed -i "/\t\tagent-ptrace /d" Makefile
8make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ 8make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="" tests \
9 | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' 9 | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
10 10
11SSHAGENT=`which ssh-agent` 11SSHAGENT=`which ssh-agent`
diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
index da7ab7716c..32761b8bb8 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
@@ -170,7 +170,7 @@ RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pa
170# conflict with each other 170# conflict with each other
171RDEPENDS:${PN}-dev = "" 171RDEPENDS:${PN}-dev = ""
172# gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies 172# gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies
173RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" 173RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed coreutils"
174 174
175RPROVIDES:${PN}-ssh = "ssh" 175RPROVIDES:${PN}-ssh = "ssh"
176RPROVIDES:${PN}-sshd = "sshd" 176RPROVIDES:${PN}-sshd = "sshd"