From: Michał Górny Date: Thu, 11 Nov 2021 03:40:40 +0000 (+0100) Subject: build_tools/make_version: Fix sed(1) syntax compatibility with NetBSD X-Git-Tag: 19.2.0-rc1~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43661122f5e7021ee33c9bd525f3852e0b2294b9;p=thirdparty%2Fasterisk.git build_tools/make_version: Fix sed(1) syntax compatibility with NetBSD Fix the sed(1) invocation used to process git-svn-id not to use "\s" that is a GNU-ism and is not supported by NetBSD sed. As a result, this call did not work properly and make_version did output the full git-svn-id line rather than the revision. ASTERISK-29852 Change-Id: Ie4b406e2748920643446851a0a252a4ca7245772 --- diff --git a/build_tools/make_version b/build_tools/make_version index ad9fb3f924..83c42d1fba 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -98,7 +98,7 @@ elif [ -d ${1}/.git ]; then # If the first log commit messages indicates that this is checked into # subversion, we'll just use the SVN- form of the revision. MODIFIED="" - SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` + SVN_REV=`${GIT} log --pretty=full -1 | sed -n '/git-svn-id:/ s/.*\@\([^ ]*\) .*/\1/p'` if [ -z "$SVN_REV" ]; then MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch) VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`