d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly reference SRCTOP, avoid multiple invocations of svn

Browse Source 
Reported by:	sjg
This commit is contained in:
Matt Macy 2018-07-22 23:20:24 +00:00
parent 87faf66318
commit 16bb9a49ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336622
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/Makefile.ec2
View File

@ -15,9 +15,15 @@ SVN_CMD= ${_P}/${_S}
. endfor
. endfor
.endif
.if exists($SRCTOP/.svn)
EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
.if exists(${SRCTOP}/.svn)
. if empty(${EC2_SVNBRANCH})
EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
. export EC2_SVNBRANCH
. endif
. if empty(${EC2_SVNREV})
EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
. export EC2_SVNREV
. endif
.else
EC2_SVNBRANCH= unknown
EC2_SVNREV= unknown