From 90d02cf0a31bdb55f088f4dfefa55c5a891c036e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@NetBSD.org>
Date: Thu, 11 Nov 2021 04:40:40 +0100
Subject: [PATCH] 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
---
build_tools/make_version | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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`
--
GitLab