Index: Makefile.vm
===================================================================
--- Makefile.vm	(revision 274909)
+++ Makefile.vm	(working copy)
@@ -62,3 +64,6 @@
 	touch ${.TARGET}
 
 vm-cloudware:	${CLOUDTARGETS}
+
+.include "${.CURDIR}/Makefile.ec2"
+
Index: Makefile.ec2
===================================================================
--- Makefile.ec2	(revision 0)
+++ Makefile.ec2	(working copy)
@@ -0,0 +1,44 @@
+#
+# $FreeBSD$
+#
+#
+# Makefile for creating an EC2 AMI from a disk image.
+#
+
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
+AMINAMESUFFIX=	-`date +%Y-%m-%d`
+.endif
+.if defined(EC2PUBLIC)
+PUBLISH=	--public
+.endif
+
+ec2ami: vm-ec2
+.if !exists(/usr/local/bin/bsdec2-image-upload)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Creating EC2 AMIs requires bsdec2-image-upload"
+	@echo "--------------------------------------------------------------"
+	@false
+.endif
+.if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
+	@echo "--------------------------------------------------------------"
+	@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
+	@echo "--------------------------------------------------------------"
+	@false
+.endif
+.if !defined(AWSREGION)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> AWSREGION must be specified EC2 AMI creation"
+	@echo "--------------------------------------------------------------"
+	@false
+.endif
+.if !defined(AWSBUCKET)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> AWSBUCKET must be specified for EC2 AMI creation"
+	@echo "--------------------------------------------------------------"
+	@false
+.endif
+	/usr/local/bin/bsdec2-image-upload ${PUBLISH}		\
+	    ${.OBJDIR}/ec2.raw					\
+	    "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}"	\
+	    "${TYPE} ${REVISION}-${BRANCH}"			\
+	    ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}

Property changes on: Makefile.ec2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property