aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec228
1 files changed, 2 insertions, 26 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index d35f166a03d4..740edc76cbfe 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -5,30 +5,6 @@
# Makefile for creating an EC2 AMI from a disk image.
#
-# Figure out where SVN is
-.if !defined(SVN_CMD) || empty(SVN_CMD)
-. for _P in /usr/bin /usr/local/bin
-. for _S in svn svnlite
-. if exists(${_P}/${_S})
-SVN_CMD= ${_P}/${_S}
-. endif
-. endfor
-. endfor
-.endif
-.if exists(${SRCTOP}/.svn)
-. if empty(EC2_SVNBRANCH)
- EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} 2>/dev/null | sed -e 's/\^\///'
-. export EC2_SVNBRANCH
-. endif
-. if empty(EC2_SVNREV)
- EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} 2>/dev/null || true
-. export EC2_SVNREV
-. endif
-.else
-EC2_SVNBRANCH= unknown
-EC2_SVNREV= unknown
-.endif
-
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
AMINAMESUFFIX!= date +-%Y-%m-%d
.endif
@@ -40,7 +16,7 @@ PUBLICSNAP= --publicsnap
.endif
.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH}
-EC2SNSVERS= ${EC2_SVNBRANCH}@${EC2_SVNREV}
+EC2SNSVERS= ${GITBRANCH}@${GITREV}
.endif
.if ${TARGET_ARCH} != "amd64"
EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/}
@@ -89,7 +65,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
${EC2ARCH} --sriov --ena \
${.OBJDIR}/ec2.raw \
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
- "${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \
+ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \
${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS}
@touch ${.TARGET}