diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-18 03:31:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 23:46:37 +0100 |
commit | 0390b0975e24158755e41060646eb4c4fe367a1e (patch) | |
tree | 2f05e26cadc5d267262658a2c60bd2256112efb3 /meta/recipes-extended/bash/bash/test-output.patch | |
parent | 0bd2dd08e3daf284a6bb7757651af8d40393aec2 (diff) | |
download | poky-0390b0975e24158755e41060646eb4c4fe367a1e.tar.gz |
bash: 4.3.30 -> 4.4
1. Rebase patches:
- fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
- test-output.patch
2. Drop backported patches:
- CVE-2016-9401.patch
- fix-run-intl.patch
3. Add ${PN}-loadable for loadable builtins which is new features in Bash 4.4
4. The 4.4 fixed CVE-2017-5932 and CVE-2016-0634
- https://security-tracker.debian.org/tracker/CVE-2017-5932
- https://security-tracker.debian.org/tracker/CVE-2016-0634
5. The 4.4 installed include header files, fix bash-dev confilicts
with lib32-bash-dev
.....
$ bitbake lib32-core-image-sato-sdk
...
|Error: Transaction check error: file /usr/include/bash/config.h
conflicts between attempted installs
|of lib32-bash-dev-4.4-r0.x86 and bash-dev-4.4-r0.core2_64
......
(From OE-Core rev: 4097694b13cd5f0d68987551c3f9af80c87dc6ae)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash/test-output.patch')
-rw-r--r-- | meta/recipes-extended/bash/bash/test-output.patch | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch index 2b09b7d977..0ffcc24587 100644 --- a/meta/recipes-extended/bash/bash/test-output.patch +++ b/meta/recipes-extended/bash/bash/test-output.patch | |||
@@ -1,25 +1,42 @@ | |||
1 | Add FAIL/PASS output to test output. | 1 | From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 10:01:56 +0800 | ||
4 | Subject: [PATCH 1/2] Add FAIL/PASS output to test output. | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
2 | 8 | ||
3 | Signed-off-by: Björn Stenberg <bjst@enea.com> | 9 | Signed-off-by: Björn Stenberg <bjst@enea.com> |
4 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | |||
12 | Rebase to 4.4 | ||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
5 | --- | 14 | --- |
6 | diff -uNr a/tests/run-all b/tests/run-all | 15 | tests/run-all | 11 ++++++++++- |
7 | --- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200 | 16 | 1 file changed, 10 insertions(+), 1 deletion(-) |
8 | +++ b/tests/run-all 2012-10-27 21:04:18.663331887 +0200 | 17 | |
9 | @@ -22,7 +22,15 @@ | 18 | diff --git a/tests/run-all b/tests/run-all |
19 | index 2882fe0..e21d026 100644 | ||
20 | --- a/tests/run-all | ||
21 | +++ b/tests/run-all | ||
22 | @@ -33,7 +33,16 @@ do | ||
10 | case $x in | 23 | case $x in |
11 | $0|run-minimal|run-gprof) ;; | 24 | $0|run-minimal|run-gprof) ;; |
12 | *.orig|*~) ;; | 25 | *.orig|*~) ;; |
13 | - *) echo $x ; sh $x ;; | 26 | - *) echo $x ; sh $x ; rm -f ${BASH_TSTOUT} ;; |
14 | + *) echo $x | 27 | + *) echo $x |
15 | + output=`sh $x` | 28 | + output=`sh $x` |
16 | + if [ -n "$output" ]; then | 29 | + if [ -n "$output" ]; then |
17 | + echo "$output" | 30 | + echo "$output" |
18 | + echo "FAIL: $x" | 31 | + echo "FAIL: $x" |
19 | + else | 32 | + else |
20 | + echo "PASS: $x" | 33 | + echo "PASS: $x" |
21 | + fi | 34 | + fi |
22 | + ;; | 35 | + rm -f ${BASH_TSTOUT} |
36 | + ;; | ||
23 | esac | 37 | esac |
24 | done | 38 | done |
25 | 39 | ||
40 | -- | ||
41 | 1.8.3.1 | ||
42 | |||