<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html;
      charset=windows-1252">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <div class="moz-cite-prefix">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:<br>
    </div>
    <blockquote type="cite"
cite="mid:6703202FD9FDFF4A8DA9ACF104AE129FBA3F2BBB@ALA-MBD.corp.ad.wrs.com">
      <meta http-equiv="Content-Type" content="text/html;
        charset=windows-1252">
      <meta name="Generator" content="Microsoft Word 14 (filtered
        medium)">
      <style><!--
/* Font Definitions */
@font-face
        {font-family:Calibri;
        panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
        {font-family:Tahoma;
        panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
        {margin:0in;
        margin-bottom:.0001pt;
        font-size:11.0pt;
        font-family:"Calibri","sans-serif";}
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:0in;
        margin-bottom:.0001pt;
        font-size:12.0pt;
        font-family:"Times New Roman","serif";}
p.msochpdefault, li.msochpdefault, div.msochpdefault
        {mso-style-name:msochpdefault;
        mso-style-priority:99;
        margin:0in;
        margin-bottom:.0001pt;
        font-size:12.0pt;
        font-family:"Calibri","sans-serif";}
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-reply;
        font-family:"Calibri","sans-serif";
        color:#1F497D;}
.MsoChpDefault
        {mso-style-type:export-only;
        font-size:10.0pt;}
@page WordSection1
        {size:8.5in 11.0in;
        margin:1.0in 1.0in 1.0in 1.0in;}
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]-->
      <div class="WordSection1">
        <p class="MsoNormal"><span style="color:#1F497D">Never mind.
            Looks like Scott just pushed a review to fix the line count<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 #B5C4DF
            1.0pt;padding:3.0pt 0in 0in 0in">
            <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 class="moz-txt-link-abbreviated" href="mailto:starlingx-discuss@lists.starlingx.io">starlingx-discuss@lists.starlingx.io</a><br>
                <b>Subject:</b> RE: Build Broken<o:p></o:p></span></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:<o:p></o:p></span></p>
        <p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">$ git diff<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">diff --git
a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch
            b/base/cluster-resource-agents/centos/meta_pat<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">index 19877b1..566c23c 100644<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">---
a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">+++
b/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">@@ -61,7 +61,6 @@ index
            a16660a..ec85fc2 100644<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">+%patch1120 -p1<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">+%patch1121 -p1<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">+%patch1122 -p1<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">-+<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">  %build<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">  if [ ! -f configure ]; then<o:p></o:p></span></p>
        <p class="MsoNormal"><span
            style="font-size:9.0pt;font-family:"Courier
            New";color:#1F497D">        ./autogen.sh<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">Is there a bug
            raised for it? I can just push this change to resolve the
            issue, rather than reverting<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"><o:p> </o:p></span></p>
        <div>
          <div style="border:none;border-top:solid #B5C4DF
            1.0pt;padding:3.0pt 0in 0in 0in">
            <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 class="moz-txt-link-abbreviated" href="mailto:starlingx-discuss@lists.starlingx.io">starlingx-discuss@lists.starlingx.io</a><br>
                <b>Subject:</b> RE: Build Broken<o:p></o:p></span></p>
          </div>
        </div>
        <p class="MsoNormal"><o:p> </o:p></p>
        <p class="MsoNormal"><span style="color:#1F497D">Suggest we
            revert<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">Brent <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 0in 0in 0in">
            <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 class="moz-txt-link-rfc2396E" href="mailto:Brent.Rowsell@windriver.com"><Brent.Rowsell@windriver.com></a>; Mihai, Irina
              <a class="moz-txt-link-rfc2396E" href="mailto:Irina.Mihai@windriver.com"><Irina.Mihai@windriver.com></a>;
              <a class="moz-txt-link-abbreviated" 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:<o:p></o:p></span></p>
        <p class="MsoNormal"><span style="color:#1F497D">$ build-pkgs
            --serial --no-descendants --no-required --no-build-info
            resource-agents<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">And the build
            failed with the same error. Reverting the commit Brent
            indicated resolves the build issue.<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">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?<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"><o:p> </o:p></span></p>
        <div>
          <div style="border:none;border-top:solid #B5C4DF
            1.0pt;padding:3.0pt 0in 0in 0in">
            <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"
                  moz-do-not-send="true">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"
                  moz-do-not-send="true">starlingx-discuss@lists.starlingx.io</a><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>
        <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/"
              moz-do-not-send="true">https://review.openstack.org/#/c/619398/</a>
            <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">Brent <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 0in 0in 0in">
            <p class="MsoNormal"><b>From:</b> Mihai, Irina [<a
                href="mailto:Irina.Mihai@windriver.com"
                moz-do-not-send="true">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"
                moz-do-not-send="true">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";color:black">Hi,<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black"><o:p> </o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">I've
                just pulled the latest code from master and see the
                error below in stx-integ.<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">It
                gets passed that if you checkout HEAD~<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black"><o:p> </o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">Thanks,<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">Irina<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black"><o:p> </o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">+++++++++++++++++++<o:p></o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black"><o:p> </o:p></span></p>
          </div>
          <div>
            <p class="MsoNormal"><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:black">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'<o:p></o:p></span></p>
          </div>
        </div>
      </div>
      <br>
      <fieldset class="mimeAttachmentHeader"></fieldset>
      <br>
      <pre wrap="">_______________________________________________
Starlingx-discuss mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Starlingx-discuss@lists.starlingx.io">Starlingx-discuss@lists.starlingx.io</a>
<a class="moz-txt-link-freetext" href="http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss">http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss</a>
</pre>
    </blockquote>
    <p><br>
    </p>
  </body>
</html>