freebsd-skq/release
Glen Barber 69c7d069af Fix a few issues with creating VOLUME_LABEL for the
installation ISOs:

 - TYPE, BRANCH, and REVISION are only defined if
   OSRELEASE is not defined, so in situations where
   one might set OSRELEASE for an in-house ISO build,
   VOLUME_LABEL would be empty.

 - makefs(8) limits the volume label to 32 characters,
   which for the powerpc64 case, OSRELEASE expands to
   FreeBSD-11.0-CURRENT-powerpc-powerpc64.  Even with
   removing the prefixing 'FreeBSD-', the string is 30
   characters long, leaving zero room for suffixing the
   type of ISO media (BO for bootonly, CD for cdrom, and
   DVD for dvdrom).

Resolve these by defining VOLUME_LABEL when defining
OSRELEASE if unset.  If OSRELEASE is defined by the
builder, use the OSRELEASE from that definition as the
VOLUME_LABEL.

In addition, for cases where both TARGET and TARGET_ARCH
are used for the VOLUME_LABEL, use TARGET_ARCH if it
differs from TARGET.

There are probably a few sharp edges here yet, but these
problems are going to affect the powerpc/powerpc64 builds
for 10.1-RELEASE, so the immediate concern is fixing the
underlying problem at hand quickly, and less so about the
elegance of the fix.

MFC after:	3 days
X-MFC-10.1:	yes, asap
Sponsored by:	The FreeBSD Foundation
2014-10-26 01:41:54 +00:00
..
amd64 Merge the following from ^/projects/release-vmimage: 2014-10-14 15:22:46 +00:00
arm Set a static revision of the Crochet checkout to avoid 2014-09-16 15:35:13 +00:00
doc Include urndis(4) in list of devices for which we generate hardware notes. 2014-10-04 23:56:25 +00:00
i386 Merge the following from ^/projects/release-vmimage: 2014-10-14 15:22:46 +00:00
pc98 - Add CHECKSUM.* support in Makefile[1]. 2013-02-03 10:26:24 +00:00
picobsd simple_httpd: cosmetic cleanups. 2014-09-18 16:53:44 +00:00
pkg_repos Update the pkg-stage target to be more compatible with pkg-1.2: 2014-01-16 16:12:09 +00:00
powerpc Use mkimg instead of md(4) and gpart. 2014-05-01 03:24:41 +00:00
scripts Separate release/scripts/mk-vmimage.sh to machine-specific 2014-10-01 17:05:40 +00:00
sparc64 - Once we have shifted arguments thrice, base-bits-dir is $1 rather than $4. 2013-07-26 14:23:25 +00:00
tools Merge the following from ^/projects/release-vmimage: 2014-10-14 15:22:46 +00:00
Makefile Fix a few issues with creating VOLUME_LABEL for the 2014-10-26 01:41:54 +00:00
rc.local Create /tmp/bsdinstall_etc even if we aren't starting the installer so that 2014-09-13 20:09:02 +00:00
release.conf.sample Merge the following revisions from ^/projects/release-vmimage: 2014-10-02 16:13:12 +00:00
release.sh Merge the following revisions from ^/projects/release-vmimage: 2014-10-02 16:13:12 +00:00