<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=iso-2022-jp">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:SimSun;
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:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
@font-face
{font-family:"Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:"\@Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"Courier New \;color\:\#1F497D";
panose-1:0 0 0 0 0 0 0 0 0 0;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
color:black;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p
{mso-style-priority:99;
margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;
color:black;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";
color:black;}
p.msochpdefault, li.msochpdefault, div.msochpdefault
{mso-style-name:msochpdefault;
mso-style-priority:99;
margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Calibri",sans-serif;
color:black;}
span.emailstyle17
{mso-style-name:emailstyle17;
font-family:"Arial",sans-serif;
color:windowtext;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle21
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle22
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle23
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle24
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;
color:black;}
span.EmailStyle27
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.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 bgcolor="white" lang="EN-US" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoNormal"><span style="color:#1F497D">Really sorry for that!<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">When I did patch rebase and fixed merge conflict issue, one blank line was introduced which
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Cause build error.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">I really need to take more careful for patch version update every time.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Thanks for the team to fix the error introduced by me immediately!<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Zhipeng<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><a name="_____replyseparator"></a><b><span style="color:windowtext">From:</span></b><span style="color:windowtext"> Scott Little [mailto:scott.little@windriver.com]
<br>
<b>Sent:</b> 2018</span><span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif;color:windowtext">年</span><span style="color:windowtext">11</span><span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif;color:windowtext">月</span><span style="color:windowtext">28</span><span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif;color:windowtext">日</span><span style="color:windowtext">
4:16<br>
<b>To:</b> starlingx-discuss@lists.starlingx.io<br>
<b>Subject:</b> Re: [Starlingx-discuss] Build Broken<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">My proposed fix for the line count error in the patch is here....<br>
<br>
<a href="https://review.openstack.org/620394">https://review.openstack.org/620394</a><br>
<br>
Scott<br>
<br>
<br>
On 18-11-27 02:51 PM, Penney, Don wrote:<span style="font-size:12.0pt"><o:p></o:p></span></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal"><span style="color:#1F497D">Never mind. Looks like Scott just pushed a review to fix the line count</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> Penney, Don
<br>
<b>Sent:</b> Tuesday, November 27, 2018 2:50 PM<br>
<b>To:</b> Rowsell, Brent; Mihai, Irina; <a href="mailto:starlingx-discuss@lists.starlingx.io">
starlingx-discuss@lists.starlingx.io</a><br>
<b>Subject:</b> RE: Build Broken</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">It looks like maybe the patch was manually modified to try to add a blank line, without rebuilding, which causes line counts and numbers to be incorrect. The following change fixes the malformation:</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">$ git diff</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch b/base/cluster-resource-agents/centos/meta_pat</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">index 19877b1..566c23c 100644</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">--- a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">+++ b/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">@@ -61,7 +61,6 @@ index a16660a..ec85fc2 100644</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">+%patch1120 -p1</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">+%patch1121 -p1</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">+%patch1122 -p1</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif">-+</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif"> %build</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif"> if [ ! -f configure ]; then</span><o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Courier New ;color:#1F497D",serif"> ./autogen.sh</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Is there a bug raised for it? I can just push this change to resolve the issue, rather than reverting</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> Rowsell, Brent
<br>
<b>Sent:</b> Tuesday, November 27, 2018 2:23 PM<br>
<b>To:</b> Penney, Don; Mihai, Irina; <a href="mailto:starlingx-discuss@lists.starlingx.io">
starlingx-discuss@lists.starlingx.io</a><br>
<b>Subject:</b> RE: Build Broken</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Suggest we revert</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Brent </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b>From:</b> Penney, Don <br>
<b>Sent:</b> Tuesday, November 27, 2018 2:22 PM<br>
<b>To:</b> Rowsell, Brent <a href="mailto:Brent.Rowsell@windriver.com"><Brent.Rowsell@windriver.com></a>; Mihai, Irina
<a href="mailto:Irina.Mihai@windriver.com"><Irina.Mihai@windriver.com></a>; <a href="mailto:starlingx-discuss@lists.starlingx.io">
starlingx-discuss@lists.starlingx.io</a><br>
<b>Subject:</b> RE: Build Broken<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">I did a repo sync and built just that package:</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">$ build-pkgs --serial --no-descendants --no-required --no-build-info resource-agents</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">And the build failed with the same error. Reverting the commit Brent indicated resolves the build issue.</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">I don’t know why the patch would be “malformed”. Nothing jumps out at me. Should we just revert it via gerrit and let Zhipeng revisit it when he’s online?</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> Rowsell, Brent [<a href="mailto:Brent.Rowsell@windriver.com">mailto:Brent.Rowsell@windriver.com</a>]
<br>
<b>Sent:</b> Tuesday, November 27, 2018 1:08 PM<br>
<b>To:</b> Mihai, Irina; <a href="mailto:starlingx-discuss@lists.starlingx.io">starlingx-discuss@lists.starlingx.io</a><br>
<b>Subject:</b> Re: [Starlingx-discuss] Build Broken</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Not sure if this is the cause, but this was pushed this morning
<a href="https://review.openstack.org/#/c/619398/">https://review.openstack.org/#/c/619398/</a>
</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Brent </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b>From:</b> Mihai, Irina [<a href="mailto:Irina.Mihai@windriver.com">mailto:Irina.Mihai@windriver.com</a>]
<br>
<b>Sent:</b> Tuesday, November 27, 2018 1:02 PM<br>
<b>To:</b> <a href="mailto:starlingx-discuss@lists.starlingx.io">starlingx-discuss@lists.starlingx.io</a><br>
<b>Subject:</b> [Starlingx-discuss] Build Broken<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">Hi,</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> </span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">I've just pulled the latest code from master and see the error below in stx-integ.</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">It gets passed that if you checkout HEAD~</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> </span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">Thanks,</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">Irina</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> </span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">+++++++++++++++++++</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif"> </span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif">17:41:54 ============ Build failed =============<br>
17:41:54 b2: ===== Build SRPM for 'resource-agents' =====<br>
17:41:54 b2: PKG_BASE=/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents<br>
17:41:54 b2: BUILD_DIR=resource-agents/rpmbuild<br>
17:41:54 b2: SRPM_DIR=/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS<br>
17:41:54 b2: Wrote: /localdisk/loadbuild/wrsroot/starlingx-0-clean/std/rpmbuild/SOURCES/resource-agents/srpm_input.md5<br>
17:41:54 b2: Rebuild required due to new or changed file: stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER<br>
17:41:54 b2: Rebuild required due to missing directory: '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS'<br>
17:41:54 b2: clean_srpm_dir build_idx=2 DIR=/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS<br>
17:41:54 b2: find: ‘/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS’: No such file or directory<br>
17:41:54 b2: resource-agents.spec<br>
17:41:54 b2: resource-agents-3.9.5<br>
17:41:54 b2: srpm_apply_meta_patches '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild' '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents' 0 'centos' 'resource-agents-3.9.5-124.el7'<br>
17:41:54 b2: Applying metadata patches<br>
17:41:54 b2: srpm_apply_patch '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch' '-p1' '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild'
0 'WRS: ' '0' '' '' '' '' 0 'resource-agents-3.9.5-124.el7' ''<br>
17:41:54 b2: patch -p1 < /localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch<br>
17:41:54 b2: patching file SPECS/resource-agents.spec<br>
17:41:54 b2: patch: **** malformed patch at line 67: ./autogen.sh<br>
17:41:54 b2: <br>
17:41:54 b2: failed to apply patch '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch'<br>
17:41:54 b2: ERROR: srpm_apply_meta_patches (1420): failed to apply patch 'spec-include-TiS-patches.patch'<br>
17:41:54 b2: ERROR: build_dir_srpm (785): failed to extract srpm '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/cgcs-centos-repo/Source/resource-agents-3.9.5-124.el7.src.rpm'<br>
17:41:54 ERROR: reaper (1303): Failed to build src.rpm from source at 'b2'</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><span style="font-size:12.0pt;font-family:"Times New Roman",serif"><br>
<br>
<br>
<o:p></o:p></span></p>
<pre>_______________________________________________<o:p></o:p></pre>
<pre>Starlingx-discuss mailing list<o:p></o:p></pre>
<pre><a href="mailto:Starlingx-discuss@lists.starlingx.io">Starlingx-discuss@lists.starlingx.io</a><o:p></o:p></pre>
<pre><a href="http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss">http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss</a><o:p></o:p></pre>
</blockquote>
<p><o:p> </o:p></p>
</div>
</body>
</html>