Commit Graph

28 Commits

Author SHA1 Message Date
gjb
be1ca7297c 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
gjb
3a86cbbbcb Invert the build date and svn revision to match the namimg
convention that has been in use for a while.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-27 17:33:30 +00:00
gjb
77794ebe2d Fix a typo.
Submitted by:	ian
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 21:58:22 +00:00
gjb
2f93a7904f Use SVNREVISION and BUILDDATE if passed into the make(1)
environment, fallback to trying to figure it out otherwise.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 20:51:44 +00:00
gjb
f54a2f297a Reindent after r283575.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:44:31 +00:00
gjb
3e1e05878e Remove duplicate exists() sanity check.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:42:28 +00:00
gjb
8e21d8b251 Set STAGE_TARGETS only if RELEASEDIR exists.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:40:36 +00:00
gjb
6e843aaf85 Remove a continuation on error, since the relevant behavior can
only occur if a particular file exists.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:34:56 +00:00
gjb
f378874c7a Fix staging virtual machine images for ftp propagation.
MFC after:	3 days
X-MFC-Note:	needs all previous changes
Sponsored by:	The FreeBSD Foundation
2015-05-22 21:38:11 +00:00
gjb
72b5c02439 Fix a number of logic and/or naming problems in Makefile.mirrors.
Reduce a number of duplicated logic.

As of this commit, this file does exactly what it is needed to do.

MFC after:	3 days
X-MFC-Note:	needs all previous changes
Sponsored by:	The FreeBSD Foundation
2015-05-22 21:04:42 +00:00
gjb
bc74bc7ccc Fix make(1) syntax error for non-embedded targets.
Sponsored by:	The FreeBSD Foundation
2015-05-21 22:50:39 +00:00
gjb
0641ba25df If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable,
which helps control some of the arm-specific bits a bit more
cleanly (but not really 'clean').

If BOARDNAME is defined (as is in the WANDBOARD configuration
RE uses), do some magic to work with the KERNCONF and BOARDNAME
to rename the file, making it a bit more intuitive for the
consumer to determine which they need.

Yes, it is ugly, that is why there is a big warning at the top.
It is, however, still much cleaner than the now 474-line shell
script, and this Makefile produces the hierarchy needed without
much evil.

MFC after:	1 week
X-MFC-Note:	needs all previous Makefile.mirror commits
Sponsored by:	The FreeBSD Foundation
2015-05-21 22:11:57 +00:00
gjb
c06534502b Remove the arm/armv6 bits from Makefile.mirrors, which needs
some re-thinking.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:43:02 +00:00
gjb
2b3486294e Include xz(1)-compressed images when not a snapshot build.
Do not suffix non-snapshot checksum files with SNAP_SUFFIX.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:22:55 +00:00
gjb
b4ea1ed9e1 cd(1) to .CURDIR before calling stat(1) to fix the path
to sh(1).

Include xz(1)-compressed images when renaming snapshot
builds.

Use OSRELEASE in place of REVISION-BRANCH for checksum
filenames.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:18:13 +00:00
gjb
97e0e7cffb Avoid polluting the filesystem when not necessary.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:27:58 +00:00
gjb
2ea98057df After the last influx of commits, and a REALLY BIG WARNING
to the top of the file.

Sponsored by:	The FreeBSD Foundation
2015-05-12 01:20:27 +00:00
gjb
56dbacefd5 Fix more paths to the actual files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:14:21 +00:00
gjb
f47265fd69 Fix more path variables.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:04:02 +00:00
gjb
9d7a2f8ca8 Provide the correct path to the checksum file.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:58:17 +00:00
gjb
ed602f1d5e Also symlink the CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:55:28 +00:00
gjb
e5abe6f698 Also copy CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:46:32 +00:00
gjb
311d76861e Fix a few incorrect variables and/or hard-coded paths.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:39:01 +00:00
gjb
8dde0f5cc4 Sigh. Fix more syntax errors introduced by the last commit.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:33:18 +00:00
gjb
0b6e1d985f Fix a make(1) syntax error.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:32:28 +00:00
gjb
7e0d11ef0c Temporarily 'rm -rf $FTPDIR' during additional testing.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:30:56 +00:00
gjb
8b206d5386 Always use the 'make install' directory as the source for images.
For RE purposes, we use the default (/R within the chroot), so
this helps avoid copying files multiple times and xz(1)-compressing
additional times when not needed.

Again, this Makefile is not for general consumption.

Sponsored by:	The FreeBSD Foundation
2015-05-12 00:27:52 +00:00
gjb
48a106e740 Add a new file, Makefile.mirrors, which is intended to replace
a 474-line kludge of a shell script to pre-create the directory
hierarchy on ftp-master.

This is not in any way connected to the build, and there is no
intention to do so.  This only intent here is to try to make
things a little bit easier for me.  But I've probably just made
things worse.

Sponsored by:	The FreeBSD Foundation
2015-05-11 22:14:03 +00:00