Commit graph

24 commits

Author SHA1 Message Date
Glen Barber 29b282f31d Makefile.inc1:
- New file.  Adds logic to search for the git binary, as well
  as determining the branch and revision, used in various
  places.

Makefile:
- Remove searching for the svn{,lite} binary.

Makefile.ec2:
- Reduce duplicated code, removing searching for the svn{,lite}
  binary, in addition to EC2_SVN{BRANCH,REV}.
- Rename EC2_SVN* with GIT* for consistency.

Makefile.mirrors:
- Remove the SRCBRANCH declaration, replaced with the exported
  GITBRANCH variable.
- Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove
  the leading 'r' from it, since it will break git hashes.
- Remove yet another instance of duplicated code to search for
  the svn{,version}lite binary.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
2020-07-16 20:34:26 +00:00
Colin Percival 01b7329605 Pass --arm64 to bsdec2-image-upload when building ARM64 AMIs.
Future commits will allow the resulting EC2 AMIs to actually boot and
be usable.
2019-03-20 07:19:09 +00:00
Colin Percival 7ac2ecc0af Quieten the svn (or svnlite) commands used to extract information from an
SVN checkout for placement into an EC2 AMI.  We only run these if there
is a .svn directory; but in the event that SVN was used to check out a
tree which is then exported over NFS, we were unnecessarily noisy.

Reported by:	Andrey Fesenko
MFC after:	3 days
X-MFC-With:	r336420, r336433, r336593, r336621,
		r336622, r336624, r337394, r337401
2018-08-21 15:30:47 +00:00
Colin Percival 4222a490f2 Fix copy-and-paste error in previous commit. 2018-08-07 00:51:49 +00:00
Colin Percival a7ec419d93 Add EC2PUBLICSNAP option to EC2 builds; this passes a (recently added)
flag to bsdec2-image-upload instructing it to mark the snapshot of its
root disk as public (which is independent from marking the created AMIs
as public).

Requested by:	Amazon
2018-08-06 19:21:32 +00:00
Matt Macy 38c0c78e50 fix use of empty in Makefile.ec2
empty() takes a variable name - not the expanded value

Reported by:	sjg
2018-07-22 23:33:48 +00:00
Matt Macy 16bb9a49ad Correctly reference SRCTOP, avoid multiple invocations of svn
Reported by:	sjg
2018-07-22 23:20:24 +00:00
Matt Macy 87faf66318 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.
2018-07-22 22:57:52 +00:00
Colin Percival 049775cef3 Use svn or svnlite, or ${SVN_CMD} if set, for extracting the SVN branch
and revision number announced in SNS notifications about new EC2 AMIs.

While I'm here, incorporate that information into the AMI "description"
fields, since it's more useful than simply echoing the information
already provided via the AMI "name".

Approved by:	gjb
2018-07-21 22:54:43 +00:00
Colin Percival 43fbd222cc Check that EC2SNSTOPIC and EC2PUBLIC are non-empty, along with being
defined, in order to avoid problems with thermite.sh.

Reported by:	gjb
2018-07-17 23:16:05 +00:00
Colin Percival a6fe18b04b Teach EC2 AMI release code to send an SNS notification after publishing
new AMIs if EC2SNSTOPIC is defined.

Reviewed by:	gjb
Requested by:	Amazon
2018-07-17 19:05:30 +00:00
Colin Percival 0edcc5b8d5 Turn on support for the Amazon "Elastic Network Adapter" in EC2 AMIs.
X-MFC-after:	318647 + fixes for some lock ordering warnings
2017-05-25 19:02:54 +00:00
Colin Percival 17dbc50b70 Add 'env - PATH=$$PATH' to bsdec2-image-upload make command, in order to
avoid environment pollution problems.  That port uses <bsd.prog.mk> but
is not compatible with the latest mk bits in HEAD.

Reported by:	gjb
No rush, but make sure it's in the tree before tomorrow by:	gjb
2016-06-09 03:54:25 +00:00
Colin Percival 4d6b637675 Enable "EC2 Enhanced Networking" (aka. SR-IOV networking) when creating
EC2 images.

X-MFC after:	if/when the driver fixes get MFCed
Relnotes:	FreeBSD now supports EC2 Enhanced Networking
2016-01-12 09:42:21 +00:00
Glen Barber 57d94a19cb Remove the HH-MM suffix from the build date suffix.
It was useful when working out several kinks when
testing automated image uploading when retrying was
necessary, but now it is making things much too messy.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-07-01 14:51:26 +00:00
Glen Barber 27d233f7cc Change the hour:minute delimiter from ':' to '-', since
the former is an invalid character in EC2 images.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-06-25 14:24:06 +00:00
Glen Barber 3c3445e8c7 Consider PRERELEASE builds snapshots, in addition to CURRENT and
STABLE.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-06-25 13:40:00 +00:00
Glen Barber e5f5cbd42c Append the hour and minute to the snapshot suffix for EC2
AMIs and Azure VM images.  This is particularly helpful for
testing to avoid name collisions, but also useful for cases
where a necessary rebuild is done before the date changes.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-06-21 12:37:31 +00:00
Glen Barber 1a5daee0dd Remove trailing tabs to avoid spamming stdout with long lines.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-06-02 17:00:31 +00:00
Glen Barber 9aa91d25f9 Include the TARGET in the EC2 AMI name.
Without this, AWS rejects subsequent image uploads of a different
architecture because the name conflicts.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-21 17:39:42 +00:00
Glen Barber 431e39f8d7 Remove a debugging line that snuck in with r282419.
Pointyhat:	gjb
MFC after:	3 days
X-MFC-With:	r282419
Sponsored by:	The FreeBSD Foundation
2015-05-04 21:34:19 +00:00
Glen Barber 98becbfc3c Add logic to detect if the net/bsdec2-image-upload port needs
to be installed. [1]

For the cw-ec2-portinstall and ec2ami targets, touch the
.TARGET file after completion to prevent duplicate invocations.

Add cw-ec2-portinstall and ec2ami to CLEANFILES.

Submitted by:	cperciva[1]
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-04 15:04:39 +00:00
Glen Barber f23e36d73c Add the cw-ec2-portinstall target to always install the
net/bsdec2-image-upload port.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-04-27 21:38:12 +00:00
Colin Percival 73d4ced07c Add code for creating an EC2 AMI. 2015-04-01 00:00:17 +00:00