<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
        {font-family:宋体;
        panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
        {font-family:"Cambria Math";
        panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
        {font-family:Calibri;
        panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
        {font-family:"\@宋体";
        panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
        {margin:0cm;
        margin-bottom:.0001pt;
        font-size:12.0pt;
        font-family:宋体;}
a:link, span.MsoHyperlink
        {mso-style-priority:99;
        color:blue;
        text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
        {mso-style-priority:99;
        color:purple;
        text-decoration:underline;}
span.hoenzb
        {mso-style-name:hoenzb;}
span.EmailStyle18
        {mso-style-type:personal-reply;
        font-family:"Calibri",sans-serif;
        color:#1F497D;}
.MsoChpDefault
        {mso-style-type:export-only;
        font-family:"Calibri",sans-serif;}
@page WordSection1
        {size:612.0pt 792.0pt;
        margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
        {page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="ZH-CN" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US">Hi Ross<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">I have try to patch it on the top master branch, it only has whitespace waring:<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">zhengrq@force:/yocto/work001/fnst/zrq/community/poky$ git apply 0001-OE-core-bash-4.3.30-4.4.patch0001-OE-core-bash-4.3.30-4.4.patch:52: trailing whitespace.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">0001-OE-core-bash-4.3.30-4.4.patch:58: trailing whitespace.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">--
<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">0001-OE-core-bash-4.3.30-4.4.patch:378: trailing whitespace.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">+ rm -f ${BASH_TSTOUT}
<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">0001-OE-core-bash-4.3.30-4.4.patch:383: trailing whitespace.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">--
<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">0001-OE-core-bash-4.3.30-4.4.patch:492: trailing whitespace.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"
<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">warning: squelched 2 whitespace errors<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">warning: 7 lines add whitespace errors.<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US">But the patch really works, I don’know why it doesn't apply to master?<o:p></o:p></span></p>
<p class="MsoNormal" style="margin-left:12.0pt;mso-para-margin-left:1.0gd"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">Zheng<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:"Calibri",sans-serif;color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:"Calibri",sans-serif;color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Burton, Ross [mailto:ross.burton@intel.com]
<br>
<b>Sent:</b> Thursday, January 19, 2017 8:31 PM<br>
<b>To:</b> Zheng, Ruoqin/</span><span style="font-size:11.0pt">郑</span><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">
</span><span style="font-size:11.0pt">若钦</span><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> <zhengrq.fnst@cn.fujitsu.com><br>
<b>Cc:</b> OE-core <openembedded-core@lists.openembedded.org><br>
<b>Subject:</b> Re: [OE-core] [PATCH] bash 4.3.30 -> 4.4<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<div>
<p class="MsoNormal"><span lang="EN-US">This doesn't apply to master for me, can you check please?<o:p></o:p></span></p>
<div>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span lang="EN-US">Ross<o:p></o:p></span></p>
</div>
</div>
<div>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<div>
<p class="MsoNormal"><span lang="EN-US">On 19 January 2017 at 02:52, Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com" target="_blank">zhengrq.fnst@cn.fujitsu.com</a>> wrote:<o:p></o:p></span></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal" style="margin-bottom:12.0pt"><span lang="EN-US">1) Upgrade bash from 4.3.30 to 4.4<br>
2) Delete 1 patche below, since they are integrated upstream.<br>
fix-run-intl.patch<br>
3) Modify 2 patches below to make it compatible with new version<br>
fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch<br>
test-output.patch<br>
4) Add 1 patche below to solve pkgconfig sanity error<br>
0001-patch-to-obtain-pkgconfig-sanity.patch<br>
<br>
Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
---<br>
.../0001-patch-to-obtain-pkgconfig-sanity.patch | 26 ++++<br>
...roc-run-heredoc-run-execscript-run-test-f.patch | 137 ++-------------------<br>
meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 -----------------<br>
meta/recipes-extended/bash/bash/test-output.patch | 20 ++-<br>
meta/recipes-extended/bash/<a href="http://bash_4.3.30.bb" target="_blank">bash_4.3.30.bb</a> | 71 -----------<br>
meta/recipes-extended/bash/<a href="http://bash_4.4.bb" target="_blank">bash_4.4.bb</a> | 38 ++++++<br>
6 files changed, 90 insertions(+), 312 deletions(-)<br>
create mode 100644 meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch<br>
delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch<br>
delete mode 100644 meta/recipes-extended/bash/<a href="http://bash_4.3.30.bb" target="_blank">bash_4.3.30.bb</a><br>
create mode 100644 meta/recipes-extended/bash/<a href="http://bash_4.4.bb" target="_blank">bash_4.4.bb</a><br>
<br>
diff --git a/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch<br>
new file mode 100644<br>
index 0000000..031eb90<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch<br>
@@ -0,0 +1,26 @@<br>
+Subject: [PATCH] patch to obtain pkgconfig sanity<br>
+<br>
+Drop the paths from the pkgconfig file <a href="http://bash.pc.in" target="_blank">
bash.pc.in</a> which will cause pkgconfig sanity error below:<br>
+ERROR: QA Issue: bash.pc failed sanity test (tmpdir) in path /yocto/work001/fnst/zrq/community/poky/build/tmp/work/i586-poky-linux/bash /4.4-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig]<br>
+<br>
+Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
+---<br>
+ support/<a href="http://bash.pc.in" target="_blank">bash.pc.in</a> | 2 --<br>
+ 1 file changed, 2 deletions(-)<br>
+<br>
+diff --git a/support/<a href="http://bash.pc.in" target="_blank">bash.pc.in</a> b/support/<a href="http://bash.pc.in" target="_blank">bash.pc.in</a><br>
+index 6009659..871fa9f 100644<br>
+--- a/support/<a href="http://bash.pc.in" target="_blank">bash.pc.in</a><br>
++++ b/support/<a href="http://bash.pc.in" target="_blank">bash.pc.in</a><br>
+@@ -12,8 +12,6 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@<br>
+ LOCAL_DEFS = @LOCAL_DEFS@<br>
+ CCFLAGS = ${LOCAL_DEFS} ${LOCAL_CFLAGS}<br>
+<br>
+-CC = @CC@<br>
+-SHOBJ_CC = @SHOBJ_CC@<br>
+ SHOBJ_CFLAGS = @SHOBJ_CFLAGS@<br>
+ SHOBJ_LD = @SHOBJ_LD@<br>
+ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch<br>
index 7f099ae..d6beaff 100644<br>
--- a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch<br>
+++ b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch<br>
@@ -20,150 +20,35 @@ the test suite should not be run as root<br>
Upstream-Status: Pending<br>
<br>
Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
---<br>
- tests/coproc.right | 5 +----<br>
- tests/coproc.tests | 30 +++++++++++++++++++++++++-----<br>
- tests/heredoc.right | 5 ++---<br>
- tests/heredoc3.sub | 3 ++-<br>
- tests/run-execscript | 3 ++-<br>
- tests/run-test | 3 ++-<br>
- 6 files changed, 34 insertions(+), 15 deletions(-)<br>
+ tests/run-execscript | 3 ++-<br>
+ tests/run-test | 3 ++-<br>
+ 2 files changed, 4 insertions(+), 2 deletions(-)<br>
<br>
-diff --git a/tests/coproc.right b/tests/coproc.right<br>
-index 6d9deaa..94b001c 100644<br>
---- a/tests/coproc.right<br>
-+++ b/tests/coproc.right<br>
-@@ -1,11 +1,8 @@<br>
--84575<br>
- 63 60<br>
- a b c<br>
--84577<br>
- 63 60<br>
- flop<br>
--./coproc.tests: line 22: 84577 Terminated coproc REFLECT { cat -; }<br>
--84579<br>
-+coproc.tests: REFLECT: status 143<br>
- 63 60<br>
- FOO<br>
- 63 60<br>
-diff --git a/tests/coproc.tests b/tests/coproc.tests<br>
-index 8be3563..d347eb7 100644<br>
---- a/tests/coproc.tests<br>
-+++ b/tests/coproc.tests<br>
-@@ -1,6 +1,13 @@<br>
-+: ${TMPDIR:=/tmp}<br>
-+TMPOUT=${TMPDIR}/coproc-wait-$BASHPID<br>
-+<br>
- coproc { echo a b c; sleep 2; }<br>
-<br>
--echo $COPROC_PID<br>
-+case $COPROC_PID in<br>
-+[0-9]*) ;;<br>
-+*) echo COPROC_PID not integer ;;<br>
-+esac<br>
-+<br>
- echo ${COPROC[@]}<br>
-<br>
- read LINE <&${COPROC[0]}<br>
-@@ -10,7 +17,11 @@ wait $COPROC_PID<br>
-<br>
- coproc REFLECT { cat - ; }<br>
-<br>
--echo $REFLECT_PID<br>
-+case $REFLECT_PID in<br>
-+[0-9]*) ;;<br>
-+*) echo REFLECT_PID not integer ;;<br>
-+esac<br>
-+<br>
- echo ${REFLECT[@]}<br>
-<br>
- echo flop >&${REFLECT[1]}<br>
-@@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]}<br>
-<br>
- echo $LINE<br>
-<br>
--kill $REFLECT_PID<br>
--wait $REFLECT_PID<br>
-+{ sleep 1; kill $REFLECT_PID; } &<br>
-+wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT: status $?"<br>
-+grep 'Terminated.*coproc.*REFLECT' < $TMPOUT >/dev/null 2>&1 || {<br>
-+ echo "coproc.tests: wait for REFLECT failed" >&2<br>
-+}<br>
-+rm -f $TMPOUT<br>
-+exec 2>&1<br>
-<br>
- coproc xcase -n -u<br>
-<br>
--echo $COPROC_PID<br>
-+case $COPROC_PID in<br>
-+[0-9]*) ;;<br>
-+*) echo COPROC_PID not integer ;;<br>
-+esac<br>
-+<br>
- echo ${COPROC[@]}<br>
-<br>
- echo foo >&${COPROC[1]}<br>
-diff --git a/tests/heredoc.right b/tests/heredoc.right<br>
-index 6abaa1f..8df91c5 100644<br>
---- a/tests/heredoc.right<br>
-+++ b/tests/heredoc.right<br>
-@@ -76,15 +76,14 @@ ENDEND<br>
- end ENDEND<br>
- hello<br>
- end hello<br>
--x star x<br>
- end x*x<br>
- helloEND<br>
- end helloEND<br>
- hello<br>
- \END<br>
- end hello<NL>\END<br>
--./heredoc3.sub: line 74: warning: here-document at line 72 delimited by end-of-file (wanted `EOF')<br>
--./heredoc3.sub: line 75: syntax error: unexpected end of file<br>
-+./heredoc3.sub: line 75: warning: here-document at line 73 delimited by end-of-file (wanted `EOF')<br>
-+./heredoc3.sub: line 76: syntax error: unexpected end of file<br>
- comsub here-string<br>
- ./heredoc.tests: line 105: warning: here-document at line 103 delimited by end-of-file (wanted `EOF')<br>
- hi<br>
-diff --git a/tests/heredoc3.sub b/tests/heredoc3.sub<br>
-index 73a111e..9d3d846 100644<br>
---- a/tests/heredoc3.sub<br>
-+++ b/tests/heredoc3.sub<br>
-@@ -49,9 +49,10 @@ hello<br>
- END<br>
- echo end hello<br>
-<br>
--cat <<x*x & touch 'x*x'<br>
-+cat <<x*x >/dev/null & touch 'x*x'<br>
- x star x<br>
- x*x<br>
-+wait $!<br>
- echo end 'x*x'<br>
- rm 'x*x'<br>
-<br>
diff --git a/tests/run-execscript b/tests/run-execscript<br>
-index f97ab21..0d00a1b 100644<br>
+index de78644..f7b075f 100644<br>
--- a/tests/run-execscript<br>
+++ b/tests/run-execscript<br>
@@ -5,5 +5,6 @@ echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory"<br>
echo "warning: produce diff output, please do not consider this a test failure" >&2<br>
echo "warning: if diff output differing only in the location of the bash" >&2<br>
echo "warning: binary appears, please do not consider this a test failure" >&2<br>
--${THIS_SH} ./execscript > /tmp/xx 2>&1<br>
+-${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1<br>
+rm -f /tmp/xx<br>
+su -c "${THIS_SH} ./execscript > /tmp/xx 2>&1" test<br>
- diff /tmp/xx exec.right && rm -f /tmp/xx<br>
+ diff ${BASH_TSTOUT} exec.right && rm -f ${BASH_TSTOUT}<br>
diff --git a/tests/run-test b/tests/run-test<br>
-index b2482c3..2e8f049 100644<br>
+index d68791c..699855f 100644<br>
--- a/tests/run-test<br>
+++ b/tests/run-test<br>
@@ -1,4 +1,5 @@<br>
unset GROUPS UID 2>/dev/null<br>
<br>
--${THIS_SH} ./test.tests >/tmp/xx 2>&1<br>
+-${THIS_SH} ./test.tests >${BASH_TSTOUT} 2>&1<br>
+rm -f /tmp/xx<br>
+su -c "${THIS_SH} ./test.tests >/tmp/xx 2>&1" test<br>
- diff /tmp/xx test.right && rm -f /tmp/xx<br>
+ diff ${BASH_TSTOUT} test.right && rm -f ${BASH_TSTOUT}<br>
--<br>
-1.9.1<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-extended/bash/bash/fix-run-intl.patch b/meta/recipes-extended/bash/bash/fix-run-intl.patch<br>
deleted file mode 100644<br>
index d4a3409..0000000<br>
--- a/meta/recipes-extended/bash/bash/fix-run-intl.patch<br>
+++ /dev/null<br>
@@ -1,110 +0,0 @@<br>
-From a00d3161fd7b6a698bdd2ed5f0ac5faac580ee2a Mon Sep 17 00:00:00 2001<br>
-From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
-Date: Wed, 3 Aug 2016 23:13:00 -0400<br>
-Subject: [PATCH] fix run-intl failed<br>
-<br>
-1. Filter extra white space of intl.right<br>
-<br>
- Due to the extra white space of intl.right, when the result of<br>
- sub-test unicode2.sub of intl.tests compared to it, the test<br>
- failed.<br>
-<br>
- So we need to filter the extra white space of intl.right.<br>
-<br>
- Import this patch for intl.right from bash devel branch:<br>
-<br>
- <a href="http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel" target="_blank">http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel</a><br>
-<br>
- commit is:<br>
-<br>
- 85ec0778f9d778e1820fb8c0e3e996f2d1103b45<br>
-<br>
-2. Change intl.right correspond to the unicode3.sub's output<br>
-<br>
- In sub-test unicode3.sub of intl.tests, the payload value is:<br>
-<br>
- payload=$'\065\247\100\063\231\053\306\123\070\237\242\352\263'<br>
-<br>
- It used quoted string expansion(escaped octal) to assign ASCII<br>
- characters to variables. So when the test run the following:<br>
-<br>
- printf %q "$payload"<br>
-<br>
- It produced:<br>
-<br>
- $'5\247@3\231+\306S8\237\242\352\263'<br>
-<br>
- When compared to the intl.right(contain the converted character), it failed.<br>
-<br>
- Import parts of patch for intl.right from bash devel branch:<br>
-<br>
- <a href="http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel" target="_blank">http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel</a><br>
-<br>
- commit is:<br>
-<br>
- 74b8cbb41398b4453d8ba04d0cdd1b25f9dcb9e3<br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
----<br>
- tests/intl.right | 30 +++++++++++++++---------------<br>
- 1 file changed, 15 insertions(+), 15 deletions(-)<br>
-<br>
-diff --git a/tests/intl.right b/tests/intl.right<br>
-index acf108a..1efdfbe 100644<br>
---- a/tests/intl.right<br>
-+++ b/tests/intl.right<br>
-@@ -18,34 +18,34 @@ aéb<br>
- 1.0000<br>
- 1,0000<br>
- Passed all 1378 Unicode tests<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 357 277 277 012<br>
-+0000000 357 277 277 012<br>
- 0000004<br>
--0000000 357 277 277 012<br>
-+0000000 357 277 277 012<br>
- 0000004<br>
--0000000 012<br>
-+0000000 012<br>
- 0000001<br>
--0000000 012<br>
-+0000000 012<br>
- 0000001<br>
--0000000 012<br>
-+0000000 012<br>
- 0000001<br>
--0000000 012<br>
-+0000000 012<br>
- 0000001<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 303 277 012<br>
-+0000000 303 277 012<br>
- 0000003<br>
--0000000 101 040 302 243 040 305 222 012<br>
-+0000000 101 040 302 243 040 305 222 012<br>
- 0000010<br>
- ./unicode3.sub: line 2: 5§@3™+ÆS8Ÿ¢ê³: command not found<br>
--5§@3™+ÆS8Ÿ¢ê³<br>
-+$'5\247@3\231+\306S8\237\242\352\263'<br>
- + : $'5\247@3\231+\306S8\237\242\352\263'<br>
---<br>
-2.8.1<br>
-<br>
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch<br>
index 2b09b7d..652ffb1 100644<br>
--- a/meta/recipes-extended/bash/bash/test-output.patch<br>
+++ b/meta/recipes-extended/bash/bash/test-output.patch<br>
@@ -2,15 +2,21 @@ Add FAIL/PASS output to test output.<br>
<br>
Signed-off-by: Björn Stenberg <<a href="mailto:bjst@enea.com">bjst@enea.com</a>><br>
Upstream-Status: Pending<br>
+<br>
+Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
---<br>
-diff -uNr a/tests/run-all b/tests/run-all<br>
---- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200<br>
-+++ b/tests/run-all 2012-10-27 21:04:<a href="tel:18.663331887">18.663331887</a> +0200<br>
-@@ -22,7 +22,15 @@<br>
+ tests/run-all | 11 ++++++++++-<br>
+ 1 file changed, 10 insertions(+), 1 deletion(-)<br>
+<br>
+diff --git a/tests/run-all b/tests/run-all<br>
+index 2882fe0..069dbbe 100644<br>
+--- a/tests/run-all<br>
++++ b/tests/run-all<br>
+@@ -33,7 +33,16 @@ do<br>
case $x in<br>
$0|run-minimal|run-gprof) ;;<br>
*.orig|*~) ;;<br>
-- *) echo $x ; sh $x ;;<br>
+- *) echo $x ; sh $x ; rm -f ${BASH_TSTOUT} ;;<br>
+ *) echo $x<br>
+ output=`sh $x`<br>
+ if [ -n "$output" ]; then<br>
@@ -19,7 +25,11 @@ diff -uNr a/tests/run-all b/tests/run-all<br>
+ else<br>
+ echo "PASS: $x"<br>
+ fi<br>
++ rm -f ${BASH_TSTOUT}<br>
+ ;;<br>
esac<br>
done<br>
<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/bash/<a href="http://bash_4.3.30.bb" target="_blank">bash_4.3.30.bb</a> b/meta/recipes-extended/bash/<a href="http://bash_4.3.30.bb" target="_blank">bash_4.3.30.bb</a><br>
deleted file mode 100644<br>
index 765562f..0000000<br>
--- a/meta/recipes-extended/bash/<a href="http://bash_4.3.30.bb" target="_blank">bash_4.3.30.bb</a><br>
+++ /dev/null<br>
@@ -1,71 +0,0 @@<br>
-require bash.inc<br>
-<br>
-# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)<br>
-LICENSE = "GPLv3+"<br>
-LIC_FILES_CHKSUM = "<a href="file:///\\COPYING;md5=d32239bcb673463ab874e80d47fae504">file://COPYING;md5=d32239bcb673463ab874e80d47fae504</a>"<br>
-<br>
-SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-031;apply=yes;striplevel=0;name=patch031 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-032;apply=yes;striplevel=0;name=patch032 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-033;apply=yes;striplevel=0;name=patch033 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-034;apply=yes;striplevel=0;name=patch034 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-035;apply=yes;striplevel=0;name=patch035 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-036;apply=yes;striplevel=0;name=patch036 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-037;apply=yes;striplevel=0;name=patch037 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-038;apply=yes;striplevel=0;name=patch038 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-039;apply=yes;striplevel=0;name=patch039 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-040;apply=yes;striplevel=0;name=patch040 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-041;apply=yes;striplevel=0;name=patch041 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-042;apply=yes;striplevel=0;name=patch042 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-043;apply=yes;striplevel=0;name=patch043 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-044;apply=yes;striplevel=0;name=patch044 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-045;apply=yes;striplevel=0;name=patch045 \<br>
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-046;apply=yes;striplevel=0;name=patch046 \<br>
- <a href="file:///\\execute_cmd.patch;striplevel=0">file://execute_cmd.patch;striplevel=0</a> \<br>
- <a href="file:///\\mkbuiltins_have_stringize.patch">file://mkbuiltins_have_stringize.patch</a> \<br>
- <a href="file:///\\build-tests.patch">file://build-tests.patch</a> \<br>
- <a href="file:///\\test-output.patch">file://test-output.patch</a> \<br>
- <a href="file:///\\fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch">file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch</a> \<br>
- <a href="file:///\\run-ptest">file://run-ptest</a> \<br>
- <a href="file:///\\fix-run-builtins.patch">file://fix-run-builtins.patch</a> \<br>
- <a href="file:///\\0001-help-fix-printf-format-security-warning.patch">file://0001-help-fix-printf-format-security-warning.patch</a> \<br>
- <a href="file:///\\fix-run-intl.patch">file://fix-run-intl.patch</a> \<br>
- "<br>
-<br>
-SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447"<br>
-SRC_URI[tarball.sha256sum] = "317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd"<br>
-<br>
-SRC_URI[patch031.md5sum] = "236df1ac1130a033ed0dbe2d2115f28f"<br>
-SRC_URI[patch031.sha256sum] = "cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d"<br>
-SRC_URI[patch032.md5sum] = "2360f7e79cfb28526f80021025ea5909"<br>
-SRC_URI[patch032.sha256sum] = "889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a"<br>
-SRC_URI[patch033.md5sum] = "b551c4ee7b8713759e4143499d0bbd48"<br>
-SRC_URI[patch033.sha256sum] = "fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16"<br>
-SRC_URI[patch034.md5sum] = "c9a56fbe0348e05a886dff97f2872b74"<br>
-SRC_URI[patch034.sha256sum] = "f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889"<br>
-SRC_URI[patch035.md5sum] = "e564e8ab44ed1ca3a4e315a9f6cabdc9"<br>
-SRC_URI[patch035.sha256sum] = "370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3"<br>
-SRC_URI[patch036.md5sum] = "b00ff66c41a7c0f06e191200981980b0"<br>
-SRC_URI[patch036.sha256sum] = "ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c"<br>
-SRC_URI[patch037.md5sum] = "be2a7b05f6ae560313f3c9d5f7127bda"<br>
-SRC_URI[patch037.sha256sum] = "33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813"<br>
-SRC_URI[patch038.md5sum] = "61e0522830b24fbe8c0d1b010f132470"<br>
-SRC_URI[patch038.sha256sum] = "adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367"<br>
-SRC_URI[patch039.md5sum] = "a4775487abe958536751c8ce53cdf6f9"<br>
-SRC_URI[patch039.sha256sum] = "ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec"<br>
-SRC_URI[patch040.md5sum] = "80d3587c58854e226055ef099ffeb535"<br>
-SRC_URI[patch040.sha256sum] = "84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b"<br>
-SRC_URI[patch041.md5sum] = "20bf63eef7cb441c0b1cc49ef3191d03"<br>
-SRC_URI[patch041.sha256sum] = "4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a"<br>
-SRC_URI[patch042.md5sum] = "70790646ae61e207c995e44931390e50"<br>
-SRC_URI[patch042.sha256sum] = "ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919"<br>
-SRC_URI[patch043.md5sum] = "855a46955cb251534e80b4732b748e37"<br>
-SRC_URI[patch043.sha256sum] = "47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180"<br>
-SRC_URI[patch044.md5sum] = "29623d3282fcbb37e1158136509b5bb8"<br>
-SRC_URI[patch044.sha256sum] = "9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99"<br>
-SRC_URI[patch045.md5sum] = "4473244ca5abfd4b018ea26dc73e7412"<br>
-SRC_URI[patch045.sha256sum] = "ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023"<br>
-SRC_URI[patch046.md5sum] = "7e5fb09991c077076b86e0e057798913"<br>
-SRC_URI[patch046.sha256sum] = "b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f"<br>
-<br>
-BBCLASSEXTEND = "nativesdk"<br>
diff --git a/meta/recipes-extended/bash/<a href="http://bash_4.4.bb" target="_blank">bash_4.4.bb</a> b/meta/recipes-extended/bash/<a href="http://bash_4.4.bb" target="_blank">bash_4.4.bb</a><br>
new file mode 100644<br>
index 0000000..16ff114<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/bash/<a href="http://bash_4.4.bb" target="_blank">bash_4.4.bb</a><br>
@@ -0,0 +1,38 @@<br>
+require bash.inc<br>
+<br>
+# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)<br>
+LICENSE = "GPLv3+"<br>
+LIC_FILES_CHKSUM = "<a href="file:///\\COPYING;md5=d32239bcb673463ab874e80d47fae504">file://COPYING;md5=d32239bcb673463ab874e80d47fae504</a>"<br>
+<br>
+SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \<br>
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-001;apply=yes;striplevel=0;name=patch001 \<br>
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-002;apply=yes;striplevel=0;name=patch002 \<br>
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003 \<br>
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004 \<br>
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005 \<br>
+ <a href="file:///\\execute_cmd.patch;striplevel=0">file://execute_cmd.patch;striplevel=0</a> \<br>
+ <a href="file:///\\mkbuiltins_have_stringize.patch">file://mkbuiltins_have_stringize.patch</a> \<br>
+ <a href="file:///\\build-tests.patch">file://build-tests.patch</a> \<br>
+ <a href="file:///\\test-output.patch">file://test-output.patch</a> \<br>
+ <a href="file:///\\fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch">file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch</a> \<br>
+ <a href="file:///\\run-ptest">file://run-ptest</a> \<br>
+ <a href="file:///\\fix-run-builtins.patch">file://fix-run-builtins.patch</a> \<br>
+ <a href="file:///\\0001-help-fix-printf-format-security-warning.patch">file://0001-help-fix-printf-format-security-warning.patch</a> \<br>
+ <a href="file:///\\0001-patch-to-obtain-pkgconfig-sanity.patch">file://0001-patch-to-obtain-pkgconfig-sanity.patch</a> \<br>
+ "<br>
+<br>
+SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"<br>
+SRC_URI[tarball.sha256sum] = "d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb"<br>
+<br>
+SRC_URI[patch001.md5sum] = "817d01a6c0af6f79308a8b7b649e53d8"<br>
+SRC_URI[patch001.sha256sum] = "3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f"<br>
+SRC_URI[patch002.md5sum] = "765e14cff12c7284009772e8e24f2fe0"<br>
+SRC_URI[patch002.sha256sum] = "7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53"<br>
+SRC_URI[patch003.md5sum] = "49e7da93bf07f510a2eb6bb43ac3e5a2"<br>
+SRC_URI[patch003.sha256sum] = "51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2"<br>
+SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4"<br>
+SRC_URI[patch004.sha256sum] = "ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3"<br>
+SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5"<br>
+SRC_URI[patch005.sha256sum] = "221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529"<br>
+<br>
+BBCLASSEXTEND = "nativesdk"<br>
<span class="hoenzb"><span style="color:#888888">--</span></span><span style="color:#888888"><br>
<span class="hoenzb">2.7.4</span><br>
<br>
<br>
<br>
</span><br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><o:p></o:p></span></p>
</blockquote>
</div>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
</div>
</div>
</body>
</html>