svn commit: r336621 - head/release

Matt Macy mmacy at FreeBSD.org
Sun Jul 22 22:57:53 UTC 2018


Author: mmacy
Date: Sun Jul 22 22:57:52 2018
New Revision: 336621
URL: https://svnweb.freebsd.org/changeset/base/336621

Log:
  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.

Modified:
  head/release/Makefile.ec2

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Sun Jul 22 22:35:17 2018	(r336620)
+++ head/release/Makefile.ec2	Sun Jul 22 22:57:52 2018	(r336621)
@@ -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


More information about the svn-src-all mailing list