<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17878">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Kevin Harwell: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build_tools/make_version: Fix sed(1) syntax compatibility with NetBSD<br><br>Fix the sed(1) invocation used to process git-svn-id not to use "\s"<br>that is a GNU-ism and is not supported by NetBSD sed. As a result,<br>this call did not work properly and make_version did output the full<br>git-svn-id line rather than the revision.<br><br>ASTERISK-29852<br><br>Change-Id: Ie4b406e2748920643446851a0a252a4ca7245772<br>---<br>M build_tools/make_version<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/build_tools/make_version b/build_tools/make_version</span><br><span>index ad9fb3f..83c42d1 100755</span><br><span>--- a/build_tools/make_version</span><br><span>+++ b/build_tools/make_version</span><br><span>@@ -98,7 +98,7 @@</span><br><span> # If the first log commit messages indicates that this is checked into</span><br><span> # subversion, we'll just use the SVN- form of the revision.</span><br><span> MODIFIED=""</span><br><span style="color: hsl(0, 100%, 40%);">- SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`</span><br><span style="color: hsl(120, 100%, 40%);">+ SVN_REV=`${GIT} log --pretty=full -1 | sed -n '/git-svn-id:/ s/.*\@\([^ ]*\) .*/\1/p'`</span><br><span> if [ -z "$SVN_REV" ]; then</span><br><span> MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch)</span><br><span> VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17878">change 17878</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17878"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Ie4b406e2748920643446851a0a252a4ca7245772 </div>
<div style="display:none"> Gerrit-Change-Number: 17878 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-CC: Michał Górny <mgorny@NetBSD.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>