History log of /freebsd-10-stable/release/Makefile
Revision Date Author Comments
# 323900 22-Sep-2017 marius

- Akin r302691 in head, synchronize the build stripping for the disc1
image with that of the bootonly image (but similarly modulo games
and groff(1)) as the amd64 disc1 image is overflowing. This also
removes the defunct WITHOUT_ATF.
- Remove the misspelled WITHOUT_INSTALLIB (also in place with correct
spelling, i. e. WITHOUT_INSTALLLIB) from the bootonly image build
stripping.

This is a direct commit to stable/10 as the corresponding knobs have
different names in head and counterparts to e. g. MK_DEBUG_FILES and
MK_TESTS default to off in stable/10 in the first place.


# 320753 06-Jul-2017 gjb

MFC r320748:
Allow passing NOPKG= to make(1) to enable the pkg-stage target
from getting executed when NOPKG is defined but empty.

Approved by: re (kib, insta-MFC)
Sponsored by: The FreeBSD Foundation


# 318853 25-May-2017 gjb

MFC r318646:
Allow PORTSDIR to be overridden in the pkg-stage target.

PR: 218393
Sponsored by: The FreeBSD Foundation


# 303121 20-Jul-2016 gjb

MFC r303003:

Make sure we clean up the rdoc and reldoc directories if NODOC
is not set.

Sponsored by: The FreeBSD Foundation


# 299079 04-May-2016 glebius

Merge r299077, which provides ability to override NO_INSTALLEXTRAKERNELS.

Override NO_INSTALLEXTRAKERNELS for the release build. Historically, in
the stable/10 branch the regular 'installkernel' target DID NOT install
extra kernels, while the release build DID. This change finally restores
POLA, I hope.

Reported by: Fedor <f att.org.ru>
Reviewed by: gjb


# 293448 08-Jan-2016 gjb

MFC r293173, r293231:
r293173:
Fix path to include .OBJDIR to avoid polluting the source
tree during 'make release'.

r293231:
Add a new target to touch the ${.OBJDIR}/release file, which
indicates the 'release' target has run (in order to prevent
subsequent invocations that may clobber original build output).

Sponsored by: The FreeBSD Foundation


# 292940 30-Dec-2015 gjb

MFC r278449, r278926:

r278449:
Enable multi-threaded xz(1) compression for release install
media.

r278926 (rpaulo):
Use xz(1) via pipe when compressing the release distribution
tarballs.

Tested on: stable/10@r292855
Sponsored by: The FreeBSD Foundation


# 290282 02-Nov-2015 dteske

MFC r287696:
The <arch>/mkisoimages.sh script in release knows how to add
extra bits from an "xtra-bits-dir". This feature is unusable
from release/Makefile. Add an XTRADIR setting to use it.
MFC r287697: Whitespace alignment

Differential Revision: https://reviews.freebsd.org/D3633
Reviewed by: kmacy
Relnotes: yes


# 289555 18-Oct-2015 gjb

MFC r289337:
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.

Sponsored by: The FreeBSD Foundation


# 285322 09-Jul-2015 gjb

MFC r276383, r276400:

r276383:
Delay dropping to the mountroot prompt for 10 seconds
in case the root device is not yet ready.

r276400:
Use the correct loader.conf(5) entry for deferring the
mountroot prompt.

Approved by: re (marius)
Reminded by: hrs
Sponsored by: The FreeBSD Foundation


# 279558 03-Mar-2015 gjb

MFC r279249, r279250, r279257:

r279249:
Add 'cloudware-install' target to handle copying cloud
disk images to a directory within DESTDIR.

Add CLOUDINSTALL variable to automatically generate the
actual list of install targets. While here, rename the
cloud-specific names from 'vm-' to 'cw-' to avoid naming
collisions.

Add AZURE_DISK, GCE_DISK, and OPENSTACK_DISK output file
variables.

Add 'cloudware-install' to the 'install' target.

r279250:
Remove a stale comment.

r279257:
Add a CLOUDPACKAGE variable to contain a list of targets for
post-install packaging cloud provider images.

Add a 'gce-package.sh' script to generate the final output
image ready for upload to the GCE platform. Right now, this
is the only image that has a specific output format (GNU-tar),
and this implementation is expected to be temporary.

This is not directly connected to the other release targets.

Sponsored by: The FreeBSD Foundation


# 278985 19-Feb-2015 gjb

MFC r277458, r277536, r277606, r277609, r277836, r277839,
r278118, r278119, r278206, r278502:

r277458:
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.

Add glue to allow enabling building cloud provider VM images
by default.

Add a 'vm-cloudware' target, used to drive all targets in
CLOUDTARGETS.

Add examples for WITH_CLOUDWARE to release.conf.sample.
Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.

Rewrite to consolidate VM image build scripts into one.

Fix duplicated mkimg(1) call in vm_create_disk().

Add primitive (untested) PowerPC/PowerPC64 VM image support.

Note: As it is currently written, the /boot/pmbr and
/boot/{gptboot,boot1.hfs} use the build host and not the
target build. Fixing this is likely going to be a hack in
itself.

mount(8) and umount(8) devfs(5) as needed.

Change path for mk-vmimage.sh from ${TARGET}/ to scripts/ now that
it is consolidated into one file.

Fix paths for the base image and output disk image files.

Set the boot partition type to 'apple-boot' for powerpc.

In vm_install_base(), copy the host resolv.conf into the build
chroot before attempting to do anything that requires working DNS
(i.e., pkg bootstrap).

In vm_extra_pre_umount(), remove the resolv.conf before the disk
image is unmounted from the backing md(4).

Silence errors when umounting the chroot's /dev, since it probably
doesn't exist when we're running this.

Unmount filesystems before attempting to destroy the md which
holds them.

Unmount filesystem and destroy md before we read the vnode from
disk and package it into a disk image. Otherwise we end up
packaging an unclean filesystem.

Merge duplicative vm-CLOUDTYPE targets before additional duplication
gets added by the impending arrival of ec2 and gcloud.

Add NOSWAP option which can be set by a vmimage.conf file to specify
that no swap space should be created in the image. This will be used
by EC2 builds, since FreeBSD/EC2 allocates swap space on "ephemeral"
disks which are physically attached to the Xen host node.

In vm_extra_install_packages(), only bootstrap pkg(8) if
VM_EXTRA_PACKAGES is empty.

In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was
bootstrapped earlier.

In vm_extra_install_base(), do not install waagent in the openstack
image, because it is not used. This appears to be a copy mistake.

Remove vm_extra_install_base() from the openstack.conf entirely,
since it does not need to be overridden.

Enable password-less sudo for openstack images.

Update the VM_EXTRA_PACKAGES list for the openstack images.

Remove vm_extra_install_base() for the Azure image, now that the
waagent exists in the ports tree.

Add sysutils/azure-agent to the VM_EXTRA_PACKAGES list.

In vm_extra_pre_umount(), remove the explicit pkg(8) install
list, as dependencies are resolved by sysutils/azure-agent.

Add a 'list-cloudware' target to print the list of supported CLOUDWARE
values and a description.

Add the AZURE_DESC and OPENSTACK_DESC descriptions.

Update release(7)

Add 'list-vmtargets' target, which produces a list of all supported
VM and cloud provider images.

Add VHD_DESC, VMDK_DESC, QCOW2_DESC, RAW_DESC image descriptions.

Update release(7) to document the list-vmtargets target.

Add initial support for the GCE (Google Compute Engine) cloud hosting
provider image.

Remove the console setting from rc.conf(5), which is not used there.
While here, set console to include vidconsole in the loader.conf(5).

Remove the pkg-clean(8) call from vm_extra_pre_umount() since the
function is often overridden.

Add vm_extra_pkg_rmcache() to call pkg-clean(8) to avoid duplicated
code.

Move resolv.conf(5) removal back to vm_extra_pre_umount() where it
belongs.

The GCE image needs resolv.conf(5) to exist (created as part of the
image setup), so it cannot be removed.

Comment the line that configures ttys(5) to 'off', which makes it
impossible to test that the image boots.

Add a note explaining why the line is commented, and not (yet) removed
entirely.

Move the 'install' bits that are specific to virtual machine images
from the Makefile to Makefile.vm.

Rename the 'install' target to 'release-install', and add a new
'vm-install' target.

Add a new 'install' target that invokes the new targets.

Add WITH_CLOUDWARE to the list of make(1) variables for the release
build.

Remove hw.vga.textmode=1 from the VM image loader.conf, which was
included during test builds and not intended to be included when
merging this project branch back to head.

Remove mk-azure.sh, which is no longer needed.

r277536:
Rename the 'release' target to 'real-release', and add two targets,
'vm-release' and 'cloudware-release', that are invoked if
WITH_VMIMAGES and WITH_CLOUDWARE are not empty.

This fixes an issue where 'make release' would not build the cloud
provider targets because CLOUDWARE was not yet set.

Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to Makefile.vm.

Note: There is no 'cloudware-install' target yet, since some of the
disk image names may need to be specific to the provider, so this is
probably best handled by the build scripts.

r277606:
Provide a recipe of "true" for building the "release" target once
its prerequisites are satisfied, in order to avoid having an implicit
rule triggered by the presence of release.sh.

r277609:
When iterating through VMFORMATS, the VMBASE file is not removed
or truncated to a zero-size file, which if used to create more
than one disk image format, can result in accidental pollution of
the target formatted disk image.

Instead of using a single VMBASE image (vm.img, by default), use
a single base file for each format, named as VMFORMAT.img, which
produces VMBASE.VMFORMAT as the final formatted image.

r277836:
Rename the 'system' target to 'disc1', which is specific to the
disc1.iso installer image.

Replace 'system' with 'release' in CLEANFILES, and add 'disc1'
to CLEANDIRS.

Ensure the 'dvd' target depends on 'packagesystem'.

Fix 'mini-memstick.img' prerequisite, which should be the 'bootonly'
target, not 'disc1' (previously 'system').

Use .TARGET as the target installation directory for the disc1.iso
and bootonly.iso images, which now expand to 'disc1' and 'bootonly'
respectively, mimicking the behavior of the 'dvd' target.

Remove '@true' from the 'release' target, and instead use
'touch ${.TARGET}' to prevent multiple iterations of
'make release' from clobbering previously-built installer
medium.

r277839:
Update release(7) to reflect renaming the 'system' target to 'disc1'.

r278118:
Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and
deduplicate.

Evaluate if firstboot_freebsd_update should be enabled based on
UNAME_r, because it is not supported for the -CURRENT or -STABLE
branches.

r278119:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)

r278206:
Bump copyright after r277458.

r278502:
In scripts/mk-vmimage.sh, prevent incorrect usage() by defaulting
VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not
a character device before it is sourced.

While here, be sure to exit if usage() is called.

This should effectively be no-op, but the usage() output was
discovered while investigating a larger issue.

* Several changes local to stable/10 were needed in order to handle
UEFI images that are specific to this branch.

Tested with: stable/10@r278906
Sponsored by: The FreeBSD Foundation


# 274102 04-Nov-2014 gjb

MFC r274095:
Fix VOLUME_LABEL when BRANCH contains '-' and '.'
characters, in particular '-' and '.'.

Insta-MFC ok: re (hrs)
Sponsored by: The FreeBSD Foundation


# 273698 26-Oct-2014 gjb

MFC r273653:
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.

Insta-MFC ok: re (kib)
Sponsored by: The FreeBSD Foundation


# 273355 20-Oct-2014 gjb

Fix label for the UEFI bootonly cd.

Sponsored by: The FreeBSD Foundation


# 273354 20-Oct-2014 gjb

MFC r273204:
Add more descriptive metadata to the ISO images.

Sponsored by: The FreeBSD Foundation


# 273198 16-Oct-2014 gjb

MFC r273093, r273096:

r273093:
Merge the following from ^/projects/release-vmimage:
r272436, r272437, r272792:

r272436:
Remove the first argument to panic(), which was initially
intended to be the exit code, however when a non-zero exit
code was returned to release/Makefile, this would prevent
any remaining (and possibly successful) stages from being
attempted.

r272437:

If the vm-base target fails, prevent the vm-image target
from being run since it cannot possibly succeed.

r272792:

Add /usr/local/bin and /usr/local/sbin to PATH, needed
if third-party software needs to use utilities outside
of the base system during post-install stages (indexinfo
is one culprit).

r273096:
Merge the following from ^/projects/release-vmimage:
r273076, r273077, r273079, r273095:

r273076:
Add a separate make(1) target to release/Makefile to
build FreeBSD virtual machine disk images for use on
the Microsoft Azure service.

For now, this target is not directly connected to the
build, however can be manually invoked.

The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh,
which does the heavy lifting to produce proper VHDs.
mk-azure.sh uses a configuration file, defaulting to
tools/azure.conf if otherwise unset.

r273077:
Clear VM_RC_LIST.

r273079:
Fix signal list to trigger umount(8).

r273095:
Output an informational message when mkimg(1) runs, so it
does not appear that the process has stopped while waiting
for a 'y/n' response when waagent is deprovisioned.

Relnotes: yes
Sponsored by: The FreeBSD Foundation


# 273080 14-Oct-2014 gjb

MFC r272414:
Merge the following revisions from ^/projects/release-vmimage:

r272234, r272236, r272262, r272264, r272269, r272271, r272272,
r272277, r272279, r272376, r272380, r272381, r272392, r272234,
r272412:

r272234:
Initial commit to include virtual machine images as part
of the FreeBSD release builds.

This adds a make(1) environment variable requirement,
WITH_VMIMAGES, which triggers the virtual machine image
targets when not defined to an empty value.

Relevant user-driven variables include:

o VMFORMATS: The virtual machine image formats to create.
Valid formats are provided by running 'mkimg --formats'

o VMSIZE: The size of the resulting virtual machine
image. Typical compression is roughly 140Mb, regardless
of the target size (10GB, 15GB, 20GB, 40GB sizes have been
tested with the same result).

o VMBASE: The prefix of the virtual machine disk images.
The VMBASE make(1) environment variable is suffixed with
each format in VMFORMATS for each individual disk image, as
well as '.img' for the source UFS filesystem passed to
mkimg(1).

This also includes a new script, mk-vmimage.sh, based on how
the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE
were created (mk-vmimage.sh in ^/user/gjb/thermite/).

With the order in which the stages need to occur, as well as
sanity-checking error cases, it makes much more sense to
execute a shell script called from make(1), using env(1) to
set specific parameters for the target image than it does to
do this in make(1) directly.

r272236:
Use VMBASE in place of a hard-coded filename in the CLEANFILES
list.

r272262:
Remove a 'set -x' that snuck in during testing.

r272264:
release/Makefile:
Connect the virtual machine image build to the release
target if WITH_VMIMAGES is set to a non-empty value.

release/release.sh:
Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS.

release/release.conf.sample:
Add commented entries for tuning the release build if the
WITH_VMIMAGES make(1) environment variable is set to
a non-empty value.

r272269:
release/Makefile:
Include .OBJDIR in DESTDIR in the vm-base target.

release/release.sh:
Provide the full path to mddev.

r272271:
Fix UFS label for the root filesystem.

r272272:
Remove comments left in accidentally while testing, so the
VM /etc/fstab is actually created.

r272277:
Remove the UFS label from the root filesystem since it is added
by mkimg(1) as a gpt label, consistent with the fstab(5) entry.

r272279:
Comment cleanup in panic() message when mkimg(1) does not support
the requested disk image format.

r272376:
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for
non-x86 targets.

Move echo output if MAKEFLAGS is empty outside of usage().

Remove TARGET/TARGET_ARCH evaluation.

r272380:
Avoid using env(1) to set values passed to mk-vmimage.sh,
and instead pass the values as arguments to the script,
making it easier to run this by hand, without 'make release'.

Add usage_vm_base() and usage_vm_image() usage helpers.

r272381:
After evaluating WITH_VMIMAGES is non-empty, ensure
the mk-vmimage.sh script exists before running it.

r272392:
Add WITH_COMPRESSED_VMIMAGES variable, which when set enables
xz(1) compression of the virtual machine images.

This is intentionally separate to allow more fine-grained
tuning over which images are compressed, especially in cases
where compressing 20GB sparse images can take hours.

r272412:
Document the new 'vm-image' target, and associated release.conf
variables.

r272413:
Remove two stray comments added during the initial iterations
of testing, no longer needed.

Sponsored by: The FreeBSD Foundation


# 272727 08-Oct-2014 gjb

Revert r272724:
Features not yet available in stable/10 are needed in
mkimg(1), and it is more dangerous to tweak these changes
in stable/10 directly without explicitly testing certain
failure cases.

Re-addition of this change is imminent.

Sponsored by: The FreeBSD Foundation


# 272724 08-Oct-2014 gjb

MFC r272414:

Merge the following revisions from ^/projects/release-vmimage:

r272234, r272236, r272262, r272264, r272269, r272271, r272272,
r272277, r272279, r272376, r272380, r272381, r272392, r272234,
r272412:

r272234:
Initial commit to include virtual machine images as part
of the FreeBSD release builds.

This adds a make(1) environment variable requirement,
WITH_VMIMAGES, which triggers the virtual machine image
targets when not defined to an empty value.

Relevant user-driven variables include:

o VMFORMATS: The virtual machine image formats to create.
Valid formats are provided by running 'mkimg --formats'

o VMSIZE: The size of the resulting virtual machine
image. Typical compression is roughly 140Mb, regardless
of the target size (10GB, 15GB, 20GB, 40GB sizes have been
tested with the same result).

o VMBASE: The prefix of the virtual machine disk images.
The VMBASE make(1) environment variable is suffixed with
each format in VMFORMATS for each individual disk image, as
well as '.img' for the source UFS filesystem passed to
mkimg(1).

This also includes a new script, mk-vmimage.sh, based on how
the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE
were created (mk-vmimage.sh in ^/user/gjb/thermite/).

With the order in which the stages need to occur, as well as
sanity-checking error cases, it makes much more sense to
execute a shell script called from make(1), using env(1) to
set specific parameters for the target image than it does to
do this in make(1) directly.

r272236:
Use VMBASE in place of a hard-coded filename in the CLEANFILES
list.

r272262:
Remove a 'set -x' that snuck in during testing.

r272264:
release/Makefile:
Connect the virtual machine image build to the release
target if WITH_VMIMAGES is set to a non-empty value.

release/release.sh:
Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS.

release/release.conf.sample:
Add commented entries for tuning the release build if the
WITH_VMIMAGES make(1) environment variable is set to
a non-empty value.

r272269:
release/Makefile:
Include .OBJDIR in DESTDIR in the vm-base target.

release/release.sh:
Provide the full path to mddev.

r272271:
Fix UFS label for the root filesystem.

r272272:
Remove comments left in accidentally while testing, so the
VM /etc/fstab is actually created.

r272277:
Remove the UFS label from the root filesystem since it is added
by mkimg(1) as a gpt label, consistent with the fstab(5) entry.

r272279:
Comment cleanup in panic() message when mkimg(1) does not support
the requested disk image format.

r272376:
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for
non-x86 targets.

Move echo output if MAKEFLAGS is empty outside of usage().

Remove TARGET/TARGET_ARCH evaluation.

r272380:
Avoid using env(1) to set values passed to mk-vmimage.sh,
and instead pass the values as arguments to the script,
making it easier to run this by hand, without 'make release'.

Add usage_vm_base() and usage_vm_image() usage helpers.

r272381:
After evaluating WITH_VMIMAGES is non-empty, ensure
the mk-vmimage.sh script exists before running it.

r272392:
Add WITH_COMPRESSED_VMIMAGES variable, which when set enables
xz(1) compression of the virtual machine images.

This is intentionally separate to allow more fine-grained
tuning over which images are compressed, especially in cases
where compressing 20GB sparse images can take hours.

r272412:
Document the new 'vm-image' target, and associated release.conf
variables.

r272413:
Remove two stray comments added during the initial iterations
of testing, no longer needed.

Sponsored by: The FreeBSD Foundation


# 271481 12-Sep-2014 gjb

Include the 'mini' (bootonly) UEFI memstick image
in the list of IMAGES.

This is a direct commit to stable/10.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation


# 271477 12-Sep-2014 gjb

Connect the UEFI-capable disc1.iso and dvd1.iso variants
to the build.

This is a direct commit to stable/10.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation


# 271334 09-Sep-2014 gjb

Connect the UEFI-capable memstick.img to the build.

This is a direct commit to stable/10, as the script
in head/ does UEFI by default.

Approved by: re (rodrigc)
Sponsored by: The FreeBSD Foundation


# 267417 12-Jun-2014 gjb

MFC r267326, r267327:

r267326:
Add empty pkg-stage file to CLEANFILES if WITH_DVD=1.

r267327:
Fix indentation level.

Sponsored by: The FreeBSD Foundation


# 264245 07-Apr-2014 gjb

MFC r264027, r264028, r264029, r264030, r264046, r264073:

r264027:
Add a new release build variable, WITH_COMPRESSED_IMAGES.

When set to a non-empty value, the installation medium is
compressed as part of the 'install' target in the release/
directory.

r264028:
Clean up trailing whitespace in release/Makefile.

r264029:
Fix logic error.

r264030:
If WITH_COMPRESSED_IMAGES is set, add the compressed images
to the CLEANFILES list.

r264046:
Use xz(1) instead of gzip(1) to compress release images
when WITH_COMPRESSED_IMAGES is used.

r264073:
Allow overriding xz(1) path.

Sponsored by: The FreeBSD Foundation


# 263015 11-Mar-2014 jhay

MFC r262036

etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree.


# 262761 04-Mar-2014 gjb

MFC r262499, r262505, r262507, r262509:

r262499:
release.sh:
- Add a VCSCMD variable that defaults to 'svn checkout',
and update places 'svn co' is used directly.
- After sourcing a configuration file, prefix SRCBRANCH,
PORTBRANCH, and DOCBRANCH with the SVNROOT.
- Properly capitalize 'FreeBSD.org' in the default SVNROOT.
- Update Copyright.

release.conf.sample:
- Add an example to use git instead of svn, by nullifying
SVNROOT, and setting SRCBRANCH, DOCBRANCH, and PORTBRANCH
to the URL fo a git repository.

release.7:
- Document VCSCMD.

r262505:
In release/Makefile, remove exclusion of CVS directories in the
src/ and ports/ distributions.

While I am thinking about it, exclude .git directories for src/
and ports/, as somewhat of a followup to r262499.

r262507:
Chase r262505, and remove CVS exclusion from picobsd builds.

r262509:
Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove an
unnecessary expr(1) call.

Sponsored by: The FreeBSD Foundation


# 260781 16-Jan-2014 gjb

MFC r260772:
Update the pkg-stage target to be more compatible with pkg-1.2:

- Add a release-dvd.conf pkg(8) configuration file to override
the default FreeBSD.conf configuration.
- Remove architecture-specific pkg-stage.conf files, consolidate,
and move their contents to scripts/pkg-stage.sh.
- Use 'pkg -vv' to determine the ABI, which is used as the
cache directory.

Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.

Tested against: head@r260522, stable/10@r260522

Sponsored by: The FreeBSD Foundation


# 259861 25-Dec-2013 gjb

MFC r259729:
Bootstrap etcupdate(8) as part of the release build, similar
to what is done for mergemaster(8). This allows etcupdate(8)
to work out-of-box after the first upgrade of a system.

Sponsored by: The FreeBSD Foundation


# 259533 17-Dec-2013 gjb

MFC r259426, r259427:
r259426:
Add a pkg(8) repository configuration file for cdrom-based package
installation.

As part of the 'pkg-stage' target, copy the configuration file
to the 'packages/repos/' directory on the DVD filesystem.

r259427:
Export 'REPOS_DIR' when the selected source medium for package
installation is cdrom. This enables bsdconfig(8) to make use
of the on-disc pkg(8) repository configuration, which fixes
package selection and installation from the dvd installer.

Sponsored by: The FreeBSD Foundation


# 259492 17-Dec-2013 gjb

MFC r258770 (hrs):
Add NOPKG to disable pkg-stage.

Sponsored by: The FreeBSD Foundation


# 259401 14-Dec-2013 gjb

MFC r259400:
Reduce disc1.iso size by 74MB by removing lib32 libraries, sendmail,
and atf.

Sponsored by: The FreeBSD Foundation


# 259399 14-Dec-2013 gjb

MFC r256430:
Reduce disc1.iso image size by installing the userland with
the WITHOUT_PROFILE=1 option set, trimming 56MB from the image.

This change was somehow lost during the 10.0-RELEASE cycle, and
is intended for MFC to releng/10.0.

Sponsored by: The FreeBSD Foundation


# 259225 11-Dec-2013 gjb

MFC r257805, r257806, r257807, r257942:

r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.

This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.

Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.

r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.

r257807:
Update release(7) to include 'mini-memstick'.

r257942:
Fix a few style nits.

Sponsored by: The FreeBSD Foundation


# 258952 04-Dec-2013 gjb

MFC r258786, r258796, r258797, r258847, r258853, r258949:

r258786:
Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise
the textproc/docproj port build fails.

r258796 (hrs):
- Prevent TARGET and TARGET_ARCH from being defined as empty when
TARGET="" and/or TARGET_ARCH="" is specified.
- Remove extra ().

r258797 (hrs):
Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.

r258847:
Provide reproducibility between builds by building pkg(8) from ports,
instead of using pkg-bootstrap.

This should resolve a problem that was discovered during 10.0-BETA4
freebsd-update(8) builds,

r258853:
Turn off the dvdrom target by default. dvd1.iso is now built by
specifying 'WITH_DVD=1' during 'make release'.

This caused some problems during the freebsd-update builds for
10.0-BETA4.

r258949:
Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating
to true.

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation


# 258761 30-Nov-2013 gjb

MFC r258669:
Document the dvdrom target and NODVD variable.

Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation


# 258415 21-Nov-2013 gjb

MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317,
r258319, r258320:

r258305:
Use the IMAGES variable to determine which image files to remove
as part of 'make -C /usr/src/release clean'.

r258307:
Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

r258308:
Unconditionally copy the build host /etc/resolv.conf into
the chroot directory, since hostname resolution may be
needed in the case of building a dvd image (with packages)
and also setting 'NOPORTS=1'.

r258309:
Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
in preparation of adding a 'dvd1.iso' target.

r258310:
Add the 'dvd1.iso' target. This mimics the 'release.iso' target,
with the additional step of fetching packages for inclusion on the
dvd image.

The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if
the '${TARGET}/pkg-stage.conf' configuration file exists (currently
only amd64 and i386).

Allow dvd1.iso to be skipped if NODVD=1.

r258314:
Fix how ABI is evaluated so it matches more than a dot-zero
case.

r258317:
Document the 'dvdrom' target.

r258319:
Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.

r258320:
Simplify PKG_ABI for pkg-stage.sh.

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation


# 285322 09-Jul-2015 gjb

MFC r276383, r276400:

r276383:
Delay dropping to the mountroot prompt for 10 seconds
in case the root device is not yet ready.

r276400:
Use the correct loader.conf(5) entry for deferring the
mountroot prompt.

Approved by: re (marius)
Reminded by: hrs
Sponsored by: The FreeBSD Foundation


# 279558 03-Mar-2015 gjb

MFC r279249, r279250, r279257:

r279249:
Add 'cloudware-install' target to handle copying cloud
disk images to a directory within DESTDIR.

Add CLOUDINSTALL variable to automatically generate the
actual list of install targets. While here, rename the
cloud-specific names from 'vm-' to 'cw-' to avoid naming
collisions.

Add AZURE_DISK, GCE_DISK, and OPENSTACK_DISK output file
variables.

Add 'cloudware-install' to the 'install' target.

r279250:
Remove a stale comment.

r279257:
Add a CLOUDPACKAGE variable to contain a list of targets for
post-install packaging cloud provider images.

Add a 'gce-package.sh' script to generate the final output
image ready for upload to the GCE platform. Right now, this
is the only image that has a specific output format (GNU-tar),
and this implementation is expected to be temporary.

This is not directly connected to the other release targets.

Sponsored by: The FreeBSD Foundation


# 278985 19-Feb-2015 gjb

MFC r277458, r277536, r277606, r277609, r277836, r277839,
r278118, r278119, r278206, r278502:

r277458:
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.

Add glue to allow enabling building cloud provider VM images
by default.

Add a 'vm-cloudware' target, used to drive all targets in
CLOUDTARGETS.

Add examples for WITH_CLOUDWARE to release.conf.sample.
Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.

Rewrite to consolidate VM image build scripts into one.

Fix duplicated mkimg(1) call in vm_create_disk().

Add primitive (untested) PowerPC/PowerPC64 VM image support.

Note: As it is currently written, the /boot/pmbr and
/boot/{gptboot,boot1.hfs} use the build host and not the
target build. Fixing this is likely going to be a hack in
itself.

mount(8) and umount(8) devfs(5) as needed.

Change path for mk-vmimage.sh from ${TARGET}/ to scripts/ now that
it is consolidated into one file.

Fix paths for the base image and output disk image files.

Set the boot partition type to 'apple-boot' for powerpc.

In vm_install_base(), copy the host resolv.conf into the build
chroot before attempting to do anything that requires working DNS
(i.e., pkg bootstrap).

In vm_extra_pre_umount(), remove the resolv.conf before the disk
image is unmounted from the backing md(4).

Silence errors when umounting the chroot's /dev, since it probably
doesn't exist when we're running this.

Unmount filesystems before attempting to destroy the md which
holds them.

Unmount filesystem and destroy md before we read the vnode from
disk and package it into a disk image. Otherwise we end up
packaging an unclean filesystem.

Merge duplicative vm-CLOUDTYPE targets before additional duplication
gets added by the impending arrival of ec2 and gcloud.

Add NOSWAP option which can be set by a vmimage.conf file to specify
that no swap space should be created in the image. This will be used
by EC2 builds, since FreeBSD/EC2 allocates swap space on "ephemeral"
disks which are physically attached to the Xen host node.

In vm_extra_install_packages(), only bootstrap pkg(8) if
VM_EXTRA_PACKAGES is empty.

In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was
bootstrapped earlier.

In vm_extra_install_base(), do not install waagent in the openstack
image, because it is not used. This appears to be a copy mistake.

Remove vm_extra_install_base() from the openstack.conf entirely,
since it does not need to be overridden.

Enable password-less sudo for openstack images.

Update the VM_EXTRA_PACKAGES list for the openstack images.

Remove vm_extra_install_base() for the Azure image, now that the
waagent exists in the ports tree.

Add sysutils/azure-agent to the VM_EXTRA_PACKAGES list.

In vm_extra_pre_umount(), remove the explicit pkg(8) install
list, as dependencies are resolved by sysutils/azure-agent.

Add a 'list-cloudware' target to print the list of supported CLOUDWARE
values and a description.

Add the AZURE_DESC and OPENSTACK_DESC descriptions.

Update release(7)

Add 'list-vmtargets' target, which produces a list of all supported
VM and cloud provider images.

Add VHD_DESC, VMDK_DESC, QCOW2_DESC, RAW_DESC image descriptions.

Update release(7) to document the list-vmtargets target.

Add initial support for the GCE (Google Compute Engine) cloud hosting
provider image.

Remove the console setting from rc.conf(5), which is not used there.
While here, set console to include vidconsole in the loader.conf(5).

Remove the pkg-clean(8) call from vm_extra_pre_umount() since the
function is often overridden.

Add vm_extra_pkg_rmcache() to call pkg-clean(8) to avoid duplicated
code.

Move resolv.conf(5) removal back to vm_extra_pre_umount() where it
belongs.

The GCE image needs resolv.conf(5) to exist (created as part of the
image setup), so it cannot be removed.

Comment the line that configures ttys(5) to 'off', which makes it
impossible to test that the image boots.

Add a note explaining why the line is commented, and not (yet) removed
entirely.

Move the 'install' bits that are specific to virtual machine images
from the Makefile to Makefile.vm.

Rename the 'install' target to 'release-install', and add a new
'vm-install' target.

Add a new 'install' target that invokes the new targets.

Add WITH_CLOUDWARE to the list of make(1) variables for the release
build.

Remove hw.vga.textmode=1 from the VM image loader.conf, which was
included during test builds and not intended to be included when
merging this project branch back to head.

Remove mk-azure.sh, which is no longer needed.

r277536:
Rename the 'release' target to 'real-release', and add two targets,
'vm-release' and 'cloudware-release', that are invoked if
WITH_VMIMAGES and WITH_CLOUDWARE are not empty.

This fixes an issue where 'make release' would not build the cloud
provider targets because CLOUDWARE was not yet set.

Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to Makefile.vm.

Note: There is no 'cloudware-install' target yet, since some of the
disk image names may need to be specific to the provider, so this is
probably best handled by the build scripts.

r277606:
Provide a recipe of "true" for building the "release" target once
its prerequisites are satisfied, in order to avoid having an implicit
rule triggered by the presence of release.sh.

r277609:
When iterating through VMFORMATS, the VMBASE file is not removed
or truncated to a zero-size file, which if used to create more
than one disk image format, can result in accidental pollution of
the target formatted disk image.

Instead of using a single VMBASE image (vm.img, by default), use
a single base file for each format, named as VMFORMAT.img, which
produces VMBASE.VMFORMAT as the final formatted image.

r277836:
Rename the 'system' target to 'disc1', which is specific to the
disc1.iso installer image.

Replace 'system' with 'release' in CLEANFILES, and add 'disc1'
to CLEANDIRS.

Ensure the 'dvd' target depends on 'packagesystem'.

Fix 'mini-memstick.img' prerequisite, which should be the 'bootonly'
target, not 'disc1' (previously 'system').

Use .TARGET as the target installation directory for the disc1.iso
and bootonly.iso images, which now expand to 'disc1' and 'bootonly'
respectively, mimicking the behavior of the 'dvd' target.

Remove '@true' from the 'release' target, and instead use
'touch ${.TARGET}' to prevent multiple iterations of
'make release' from clobbering previously-built installer
medium.

r277839:
Update release(7) to reflect renaming the 'system' target to 'disc1'.

r278118:
Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and
deduplicate.

Evaluate if firstboot_freebsd_update should be enabled based on
UNAME_r, because it is not supported for the -CURRENT or -STABLE
branches.

r278119:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)

r278206:
Bump copyright after r277458.

r278502:
In scripts/mk-vmimage.sh, prevent incorrect usage() by defaulting
VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not
a character device before it is sourced.

While here, be sure to exit if usage() is called.

This should effectively be no-op, but the usage() output was
discovered while investigating a larger issue.

* Several changes local to stable/10 were needed in order to handle
UEFI images that are specific to this branch.

Tested with: stable/10@r278906
Sponsored by: The FreeBSD Foundation


# 274102 04-Nov-2014 gjb

MFC r274095:
Fix VOLUME_LABEL when BRANCH contains '-' and '.'
characters, in particular '-' and '.'.

Insta-MFC ok: re (hrs)
Sponsored by: The FreeBSD Foundation


# 273698 26-Oct-2014 gjb

MFC r273653:
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.

Insta-MFC ok: re (kib)
Sponsored by: The FreeBSD Foundation


# 273355 20-Oct-2014 gjb

Fix label for the UEFI bootonly cd.

Sponsored by: The FreeBSD Foundation


# 273354 20-Oct-2014 gjb

MFC r273204:
Add more descriptive metadata to the ISO images.

Sponsored by: The FreeBSD Foundation


# 273198 16-Oct-2014 gjb

MFC r273093, r273096:

r273093:
Merge the following from ^/projects/release-vmimage:
r272436, r272437, r272792:

r272436:
Remove the first argument to panic(), which was initially
intended to be the exit code, however when a non-zero exit
code was returned to release/Makefile, this would prevent
any remaining (and possibly successful) stages from being
attempted.

r272437:

If the vm-base target fails, prevent the vm-image target
from being run since it cannot possibly succeed.

r272792:

Add /usr/local/bin and /usr/local/sbin to PATH, needed
if third-party software needs to use utilities outside
of the base system during post-install stages (indexinfo
is one culprit).

r273096:
Merge the following from ^/projects/release-vmimage:
r273076, r273077, r273079, r273095:

r273076:
Add a separate make(1) target to release/Makefile to
build FreeBSD virtual machine disk images for use on
the Microsoft Azure service.

For now, this target is not directly connected to the
build, however can be manually invoked.

The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh,
which does the heavy lifting to produce proper VHDs.
mk-azure.sh uses a configuration file, defaulting to
tools/azure.conf if otherwise unset.

r273077:
Clear VM_RC_LIST.

r273079:
Fix signal list to trigger umount(8).

r273095:
Output an informational message when mkimg(1) runs, so it
does not appear that the process has stopped while waiting
for a 'y/n' response when waagent is deprovisioned.

Relnotes: yes
Sponsored by: The FreeBSD Foundation


# 273080 14-Oct-2014 gjb

MFC r272414:
Merge the following revisions from ^/projects/release-vmimage:

r272234, r272236, r272262, r272264, r272269, r272271, r272272,
r272277, r272279, r272376, r272380, r272381, r272392, r272234,
r272412:

r272234:
Initial commit to include virtual machine images as part
of the FreeBSD release builds.

This adds a make(1) environment variable requirement,
WITH_VMIMAGES, which triggers the virtual machine image
targets when not defined to an empty value.

Relevant user-driven variables include:

o VMFORMATS: The virtual machine image formats to create.
Valid formats are provided by running 'mkimg --formats'

o VMSIZE: The size of the resulting virtual machine
image. Typical compression is roughly 140Mb, regardless
of the target size (10GB, 15GB, 20GB, 40GB sizes have been
tested with the same result).

o VMBASE: The prefix of the virtual machine disk images.
The VMBASE make(1) environment variable is suffixed with
each format in VMFORMATS for each individual disk image, as
well as '.img' for the source UFS filesystem passed to
mkimg(1).

This also includes a new script, mk-vmimage.sh, based on how
the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE
were created (mk-vmimage.sh in ^/user/gjb/thermite/).

With the order in which the stages need to occur, as well as
sanity-checking error cases, it makes much more sense to
execute a shell script called from make(1), using env(1) to
set specific parameters for the target image than it does to
do this in make(1) directly.

r272236:
Use VMBASE in place of a hard-coded filename in the CLEANFILES
list.

r272262:
Remove a 'set -x' that snuck in during testing.

r272264:
release/Makefile:
Connect the virtual machine image build to the release
target if WITH_VMIMAGES is set to a non-empty value.

release/release.sh:
Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS.

release/release.conf.sample:
Add commented entries for tuning the release build if the
WITH_VMIMAGES make(1) environment variable is set to
a non-empty value.

r272269:
release/Makefile:
Include .OBJDIR in DESTDIR in the vm-base target.

release/release.sh:
Provide the full path to mddev.

r272271:
Fix UFS label for the root filesystem.

r272272:
Remove comments left in accidentally while testing, so the
VM /etc/fstab is actually created.

r272277:
Remove the UFS label from the root filesystem since it is added
by mkimg(1) as a gpt label, consistent with the fstab(5) entry.

r272279:
Comment cleanup in panic() message when mkimg(1) does not support
the requested disk image format.

r272376:
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for
non-x86 targets.

Move echo output if MAKEFLAGS is empty outside of usage().

Remove TARGET/TARGET_ARCH evaluation.

r272380:
Avoid using env(1) to set values passed to mk-vmimage.sh,
and instead pass the values as arguments to the script,
making it easier to run this by hand, without 'make release'.

Add usage_vm_base() and usage_vm_image() usage helpers.

r272381:
After evaluating WITH_VMIMAGES is non-empty, ensure
the mk-vmimage.sh script exists before running it.

r272392:
Add WITH_COMPRESSED_VMIMAGES variable, which when set enables
xz(1) compression of the virtual machine images.

This is intentionally separate to allow more fine-grained
tuning over which images are compressed, especially in cases
where compressing 20GB sparse images can take hours.

r272412:
Document the new 'vm-image' target, and associated release.conf
variables.

r272413:
Remove two stray comments added during the initial iterations
of testing, no longer needed.

Sponsored by: The FreeBSD Foundation


# 272727 08-Oct-2014 gjb

Revert r272724:
Features not yet available in stable/10 are needed in
mkimg(1), and it is more dangerous to tweak these changes
in stable/10 directly without explicitly testing certain
failure cases.

Re-addition of this change is imminent.

Sponsored by: The FreeBSD Foundation


# 272724 08-Oct-2014 gjb

MFC r272414:

Merge the following revisions from ^/projects/release-vmimage:

r272234, r272236, r272262, r272264, r272269, r272271, r272272,
r272277, r272279, r272376, r272380, r272381, r272392, r272234,
r272412:

r272234:
Initial commit to include virtual machine images as part
of the FreeBSD release builds.

This adds a make(1) environment variable requirement,
WITH_VMIMAGES, which triggers the virtual machine image
targets when not defined to an empty value.

Relevant user-driven variables include:

o VMFORMATS: The virtual machine image formats to create.
Valid formats are provided by running 'mkimg --formats'

o VMSIZE: The size of the resulting virtual machine
image. Typical compression is roughly 140Mb, regardless
of the target size (10GB, 15GB, 20GB, 40GB sizes have been
tested with the same result).

o VMBASE: The prefix of the virtual machine disk images.
The VMBASE make(1) environment variable is suffixed with
each format in VMFORMATS for each individual disk image, as
well as '.img' for the source UFS filesystem passed to
mkimg(1).

This also includes a new script, mk-vmimage.sh, based on how
the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE
were created (mk-vmimage.sh in ^/user/gjb/thermite/).

With the order in which the stages need to occur, as well as
sanity-checking error cases, it makes much more sense to
execute a shell script called from make(1), using env(1) to
set specific parameters for the target image than it does to
do this in make(1) directly.

r272236:
Use VMBASE in place of a hard-coded filename in the CLEANFILES
list.

r272262:
Remove a 'set -x' that snuck in during testing.

r272264:
release/Makefile:
Connect the virtual machine image build to the release
target if WITH_VMIMAGES is set to a non-empty value.

release/release.sh:
Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS.

release/release.conf.sample:
Add commented entries for tuning the release build if the
WITH_VMIMAGES make(1) environment variable is set to
a non-empty value.

r272269:
release/Makefile:
Include .OBJDIR in DESTDIR in the vm-base target.

release/release.sh:
Provide the full path to mddev.

r272271:
Fix UFS label for the root filesystem.

r272272:
Remove comments left in accidentally while testing, so the
VM /etc/fstab is actually created.

r272277:
Remove the UFS label from the root filesystem since it is added
by mkimg(1) as a gpt label, consistent with the fstab(5) entry.

r272279:
Comment cleanup in panic() message when mkimg(1) does not support
the requested disk image format.

r272376:
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for
non-x86 targets.

Move echo output if MAKEFLAGS is empty outside of usage().

Remove TARGET/TARGET_ARCH evaluation.

r272380:
Avoid using env(1) to set values passed to mk-vmimage.sh,
and instead pass the values as arguments to the script,
making it easier to run this by hand, without 'make release'.

Add usage_vm_base() and usage_vm_image() usage helpers.

r272381:
After evaluating WITH_VMIMAGES is non-empty, ensure
the mk-vmimage.sh script exists before running it.

r272392:
Add WITH_COMPRESSED_VMIMAGES variable, which when set enables
xz(1) compression of the virtual machine images.

This is intentionally separate to allow more fine-grained
tuning over which images are compressed, especially in cases
where compressing 20GB sparse images can take hours.

r272412:
Document the new 'vm-image' target, and associated release.conf
variables.

r272413:
Remove two stray comments added during the initial iterations
of testing, no longer needed.

Sponsored by: The FreeBSD Foundation


# 271481 12-Sep-2014 gjb

Include the 'mini' (bootonly) UEFI memstick image
in the list of IMAGES.

This is a direct commit to stable/10.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation


# 271477 12-Sep-2014 gjb

Connect the UEFI-capable disc1.iso and dvd1.iso variants
to the build.

This is a direct commit to stable/10.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation


# 271334 09-Sep-2014 gjb

Connect the UEFI-capable memstick.img to the build.

This is a direct commit to stable/10, as the script
in head/ does UEFI by default.

Approved by: re (rodrigc)
Sponsored by: The FreeBSD Foundation


# 267417 12-Jun-2014 gjb

MFC r267326, r267327:

r267326:
Add empty pkg-stage file to CLEANFILES if WITH_DVD=1.

r267327:
Fix indentation level.

Sponsored by: The FreeBSD Foundation


# 264245 07-Apr-2014 gjb

MFC r264027, r264028, r264029, r264030, r264046, r264073:

r264027:
Add a new release build variable, WITH_COMPRESSED_IMAGES.

When set to a non-empty value, the installation medium is
compressed as part of the 'install' target in the release/
directory.

r264028:
Clean up trailing whitespace in release/Makefile.

r264029:
Fix logic error.

r264030:
If WITH_COMPRESSED_IMAGES is set, add the compressed images
to the CLEANFILES list.

r264046:
Use xz(1) instead of gzip(1) to compress release images
when WITH_COMPRESSED_IMAGES is used.

r264073:
Allow overriding xz(1) path.

Sponsored by: The FreeBSD Foundation


# 263015 11-Mar-2014 jhay

MFC r262036

etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree.


# 262761 04-Mar-2014 gjb

MFC r262499, r262505, r262507, r262509:

r262499:
release.sh:
- Add a VCSCMD variable that defaults to 'svn checkout',
and update places 'svn co' is used directly.
- After sourcing a configuration file, prefix SRCBRANCH,
PORTBRANCH, and DOCBRANCH with the SVNROOT.
- Properly capitalize 'FreeBSD.org' in the default SVNROOT.
- Update Copyright.

release.conf.sample:
- Add an example to use git instead of svn, by nullifying
SVNROOT, and setting SRCBRANCH, DOCBRANCH, and PORTBRANCH
to the URL fo a git repository.

release.7:
- Document VCSCMD.

r262505:
In release/Makefile, remove exclusion of CVS directories in the
src/ and ports/ distributions.

While I am thinking about it, exclude .git directories for src/
and ports/, as somewhat of a followup to r262499.

r262507:
Chase r262505, and remove CVS exclusion from picobsd builds.

r262509:
Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove an
unnecessary expr(1) call.

Sponsored by: The FreeBSD Foundation


# 260781 16-Jan-2014 gjb

MFC r260772:
Update the pkg-stage target to be more compatible with pkg-1.2:

- Add a release-dvd.conf pkg(8) configuration file to override
the default FreeBSD.conf configuration.
- Remove architecture-specific pkg-stage.conf files, consolidate,
and move their contents to scripts/pkg-stage.sh.
- Use 'pkg -vv' to determine the ABI, which is used as the
cache directory.

Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.

Tested against: head@r260522, stable/10@r260522

Sponsored by: The FreeBSD Foundation


# 259861 25-Dec-2013 gjb

MFC r259729:
Bootstrap etcupdate(8) as part of the release build, similar
to what is done for mergemaster(8). This allows etcupdate(8)
to work out-of-box after the first upgrade of a system.

Sponsored by: The FreeBSD Foundation


# 259533 17-Dec-2013 gjb

MFC r259426, r259427:
r259426:
Add a pkg(8) repository configuration file for cdrom-based package
installation.

As part of the 'pkg-stage' target, copy the configuration file
to the 'packages/repos/' directory on the DVD filesystem.

r259427:
Export 'REPOS_DIR' when the selected source medium for package
installation is cdrom. This enables bsdconfig(8) to make use
of the on-disc pkg(8) repository configuration, which fixes
package selection and installation from the dvd installer.

Sponsored by: The FreeBSD Foundation


# 259492 17-Dec-2013 gjb

MFC r258770 (hrs):
Add NOPKG to disable pkg-stage.

Sponsored by: The FreeBSD Foundation


# 259401 14-Dec-2013 gjb

MFC r259400:
Reduce disc1.iso size by 74MB by removing lib32 libraries, sendmail,
and atf.

Sponsored by: The FreeBSD Foundation


# 259399 14-Dec-2013 gjb

MFC r256430:
Reduce disc1.iso image size by installing the userland with
the WITHOUT_PROFILE=1 option set, trimming 56MB from the image.

This change was somehow lost during the 10.0-RELEASE cycle, and
is intended for MFC to releng/10.0.

Sponsored by: The FreeBSD Foundation


# 259225 11-Dec-2013 gjb

MFC r257805, r257806, r257807, r257942:

r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.

This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.

Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.

r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.

r257807:
Update release(7) to include 'mini-memstick'.

r257942:
Fix a few style nits.

Sponsored by: The FreeBSD Foundation


# 258952 04-Dec-2013 gjb

MFC r258786, r258796, r258797, r258847, r258853, r258949:

r258786:
Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise
the textproc/docproj port build fails.

r258796 (hrs):
- Prevent TARGET and TARGET_ARCH from being defined as empty when
TARGET="" and/or TARGET_ARCH="" is specified.
- Remove extra ().

r258797 (hrs):
Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.

r258847:
Provide reproducibility between builds by building pkg(8) from ports,
instead of using pkg-bootstrap.

This should resolve a problem that was discovered during 10.0-BETA4
freebsd-update(8) builds,

r258853:
Turn off the dvdrom target by default. dvd1.iso is now built by
specifying 'WITH_DVD=1' during 'make release'.

This caused some problems during the freebsd-update builds for
10.0-BETA4.

r258949:
Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating
to true.

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation


# 258761 30-Nov-2013 gjb

MFC r258669:
Document the dvdrom target and NODVD variable.

Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation


# 258415 21-Nov-2013 gjb

MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317,
r258319, r258320:

r258305:
Use the IMAGES variable to determine which image files to remove
as part of 'make -C /usr/src/release clean'.

r258307:
Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

r258308:
Unconditionally copy the build host /etc/resolv.conf into
the chroot directory, since hostname resolution may be
needed in the case of building a dvd image (with packages)
and also setting 'NOPORTS=1'.

r258309:
Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
in preparation of adding a 'dvd1.iso' target.

r258310:
Add the 'dvd1.iso' target. This mimics the 'release.iso' target,
with the additional step of fetching packages for inclusion on the
dvd image.

The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if
the '${TARGET}/pkg-stage.conf' configuration file exists (currently
only amd64 and i386).

Allow dvd1.iso to be skipped if NODVD=1.

r258314:
Fix how ABI is evaluated so it matches more than a dot-zero
case.

r258317:
Document the 'dvdrom' target.

r258319:
Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.

r258320:
Simplify PKG_ABI for pkg-stage.sh.

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation