Commit Graph

38 Commits

Author SHA1 Message Date
Glen Barber
d3df64ad99 Append the branch commit count to _SNAP_SUFFIX for development
snapshot builds.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
2020-12-16 18:40:49 +00:00
Glen Barber
4708d329f8 Fix staging riscv images.
Sponsored by:	Rubicon Communications, LLC (netgate.com)
2020-12-09 20:38:26 +00:00
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
Glen Barber
343a7eabf3 Include files containing metadata specific to the branch in the
directory where the individual distribution sets exist.

The new metadata files include the build date, svn branch, and
revision of the build.

Requested by:	Mellanox Technologies (via kib)
MFC after:	3 days
Sponsored by:	Rubicon Communications, LLC (Netgate)
2019-06-25 14:56:13 +00:00
Glen Barber
768a8d8d44 Fix the ftp-stage target for arm embedded builds.
The images were renamed from KERNCONF to BOARDNAME when
specified, which would result in an image name of:

 12.0-CURRENT-arm-armv7-GENERIC.img

which would then be renamed to use the BOARDNAME for the
SoC the image is targeted to use.  BOARDNAME was specified
for all images as of r336994, which now causes the ftp-stage
target to fail, as the rename is no longer necessary.

Sponsored by:	The FreeBSD Foundation
2018-08-02 18:51:44 +00:00
Glen Barber
d412b1d7bc Update the GUMSTIX image build to use arm/arm TARGET/TARGET_ARCH.
Update the TARGET/TARGET_ARCH matching in release/release.sh and
release/Makefile.mirrors for simplification.

Discussed with:	mmel
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2017-11-13 19:31:51 +00:00
Warner Losh
0b972ac92e Support armv7 builds for userland
Make armv7 as a new MACHINE_ARCH.

Copy all the places we do armv6 and add armv7 as basically an
alias. clang appears to generate code for armv7 by default. armv7 hard
float isn't supported by the the in-tree gcc, so it hasn't been
updated to have a new default.

Support armv7 as a new valid MACHINE_ARCH (and by extension
TARGET_ARCH).

Add armv7 to the universe build.

Differential Revision: https://reviews.freebsd.org/D12010
2017-10-05 23:01:33 +00:00
Glen Barber
b18ebc9201 Fix the ftp-stage target for RPI3 images by loosening the
constraints on the TARGET and TARGET_ARCH variables.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2017-07-05 16:55:45 +00:00
Glen Barber
279dc9ca3d Make Makefile.mirrors -ALPHA${N}-aware.
Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
2016-05-27 01:07:48 +00:00
Glen Barber
34187a086a Deprecate MD5 checksum generation in favor of SHA512.
This was discussed during the 10.2-RELEASE cycle, however
since we were nearing the end of the cycle, we decided to
defer this change until after 10.2-RELEASE.

Reminded by:	so (delphij), jmg
MFC after:	5 days
Sponsored by:	The FreeBSD Foundation
2015-10-14 22:33:11 +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
18a259a802 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
Glen Barber
e14ba20ace Fix a typo.
Submitted by:	ian
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 21:58:22 +00:00
Glen Barber
0c55af22ae 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
Glen Barber
42da72761e Reindent after r283575.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:44:31 +00:00
Glen Barber
508485254c Remove duplicate exists() sanity check.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:42:28 +00:00
Glen Barber
b4995ae486 Set STAGE_TARGETS only if RELEASEDIR exists.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-26 17:40:36 +00:00
Glen Barber
d97ccee166 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
Glen Barber
57cb4b9323 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
Glen Barber
b72901325f 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
Glen Barber
8e2e6ab32f Fix make(1) syntax error for non-embedded targets.
Sponsored by:	The FreeBSD Foundation
2015-05-21 22:50:39 +00:00
Glen Barber
a254b464d8 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
Glen Barber
3e99786994 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
Glen Barber
7ee01d2b1e 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
Glen Barber
2bdd60a101 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
Glen Barber
6a1e2e9a1c Avoid polluting the filesystem when not necessary.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:27:58 +00:00
Glen Barber
1d4b5e16dd 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
Glen Barber
d44da388a9 Fix more paths to the actual files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:14:21 +00:00
Glen Barber
635289e06b Fix more path variables.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:04:02 +00:00
Glen Barber
afeaf77134 Provide the correct path to the checksum file.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:58:17 +00:00
Glen Barber
dc5c69bdd1 Also symlink the CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:55:28 +00:00
Glen Barber
32ade9ef5a Also copy CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:46:32 +00:00
Glen Barber
a3ba37b499 Fix a few incorrect variables and/or hard-coded paths.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:39:01 +00:00
Glen Barber
0a87b16c59 Sigh. Fix more syntax errors introduced by the last commit.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:33:18 +00:00
Glen Barber
1baab0b301 Fix a make(1) syntax error.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:32:28 +00:00
Glen Barber
99f888885d Temporarily 'rm -rf $FTPDIR' during additional testing.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:30:56 +00:00
Glen Barber
be59bc7ae9 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
Glen Barber
2345494662 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