diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-03-08 10:32:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-09 11:46:27 +0000 |
commit | 2c86f586d55d0f6b99053e3e4d14c9ee36fa8aa8 (patch) | |
tree | 84da17ca98ee0bb7347cee9d513b2d3955689c4a /meta/recipes-connectivity/openssh/openssh | |
parent | 19e1beb5ae21254854c11873ae0298d466ee1c08 (diff) | |
download | poky-2c86f586d55d0f6b99053e3e4d14c9ee36fa8aa8.tar.gz |
openssh: update 8.8 -> 8.9
License-Update: blowfish relicensed under 3-BSD.
Fix up ptests; listing the helper binaries one by one
is not necessary. Unittests are skipped explicitly in run-ptest,
no need to avoid building them. They still take long, but they
can be executed on target if wanted.
(From OE-Core rev: 9f031d936edb69c038639656288c84564434b906)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch | 35 | ||||
-rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch b/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch new file mode 100644 index 0000000000..847c0a143c --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From f107467179428a0e3ea9e4aa9738ac12ff02822d Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Thu, 24 Feb 2022 16:04:18 +0000 | ||
4 | Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support | ||
5 | |||
6 | GCC doesn't tell us whether this option is supported unless it runs into | ||
7 | the situation where it would need to emit corresponding code. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | m4/openssh.m4 | 3 +++ | ||
13 | 1 file changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/m4/openssh.m4 b/m4/openssh.m4 | ||
16 | index 4f9c3792dc1..8c33c701b8b 100644 | ||
17 | --- a/m4/openssh.m4 | ||
18 | +++ b/m4/openssh.m4 | ||
19 | @@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ | ||
20 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
21 | #include <stdlib.h> | ||
22 | #include <stdio.h> | ||
23 | +/* Trivial function to help test for -fzero-call-used-regs */ | ||
24 | +void f(int n) {} | ||
25 | int main(int argc, char **argv) { | ||
26 | (void)argv; | ||
27 | /* Some math to catch -ftrapv problems in the toolchain */ | ||
28 | @@ -21,6 +23,7 @@ int main(int argc, char **argv) { | ||
29 | float l = i * 2.1; | ||
30 | double m = l / 0.5; | ||
31 | long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; | ||
32 | + f(0); | ||
33 | printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); | ||
34 | /* | ||
35 | * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does | ||
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index ae03e929b2..8a9b770d59 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 | ||
6 | cd regress | 6 | cd regress |
7 | sed -i "/\t\tagent-ptrace /d" Makefile | 7 | sed -i "/\t\tagent-ptrace /d" Makefile |
8 | make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ | 8 | make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="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 | ||
11 | SSHAGENT=`which ssh-agent` | 11 | SSHAGENT=`which ssh-agent` |