aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2018-07-22 22:57:52 +0000
committerMatt Macy <mmacy@FreeBSD.org>2018-07-22 22:57:52 +0000
commit87faf663183535257e6a36e68c7d3c607ac004f9 (patch)
tree6696ce97514a7e374eba30279105c3283a2b41f2 /release/Makefile.ec2
parent8407faa1b33d55dc850e1628bb34302f0d2b1828 (diff)
downloadsrc-87faf663183535257e6a36e68c7d3c607ac004f9.tar.gz
src-87faf663183535257e6a36e68c7d3c607ac004f9.zip
fix build non-svn checkouts post r336593
The change made in r336593 assumes that the build is happening in a svn checkout resulting in misleading debug output. Check that we're actually working in an svn checkout before proceeding to call svn.
Notes
Notes: svn path=/head/; revision=336621
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec25
1 files changed, 5 insertions, 0 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index eedd0217ba9b..1a18229a7b0e 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -15,8 +15,13 @@ 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}
+.else
+EC2_SVNBRANCH= unknown
+EC2_SVNREV= unknown
+.endif
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
AMINAMESUFFIX!= date +-%Y-%m-%d