- Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1
builds.
- Update newvers.sh to reflect RC1.
- Update __FreeBSD_version to reflect 10.2.
- Update default pkg(8) configuration to use the quarterly branch.[1]

Discussed with: re, portmgr [1]
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

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

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

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

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

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

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

Fix label for the UEFI bootonly cd.

Sponsored by: The FreeBSD Foundation

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

Sponsored by: The FreeBSD Foundation

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

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

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

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

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

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

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

MFC r267326, r267327:

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

r267327:
Fix indentation level.

Sponsored by: The FreeBSD Foundation

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

MFC r262036

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

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

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

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

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

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

Sponsored by: The FreeBSD Foundation

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

Sponsored by: The FreeBSD Foundation

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

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

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

MFC r258669:
Document the dvdrom target and NODVD variable.

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

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

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

Remove BIND.

Approved by: re (gjb)

For consistency with previous releases, name the cdrom install
cd 'disc1.iso'.

Discussed with: re@ team
Approved by: kib (mentor)
MFC after: 3 days
X-MFC-To: stable/9 only

Create memstick images with the '.img' filename extension.

Requested by: many
Approved by: kib (mentor)
MFC after: 3 days
X-MFC-To: stable/9 only

Convert old make variable modifiers :U and :L to bmake :tu and :tl.

Reviewed by: sjg

- Add CHECKSUM.* support in Makefile[1].
- Use ln -fs to create a symlink.
- Remove pkgadd for docports.
- Use WITHOUT_JADETEX=yes instead of WITH_JADETEX=no.
- Add {WORLD,KERNEL}_FLAGS to [BTWK]MAKE.
- Use makefs(8) and gpart(8) for sparc64 ISO image[2].
- Add publisher option to makefs(8)[2].

Based on work by: gjb[1]
Discussed with: marius, nwhitehorn[2]

Prevent including .zfs snapshot directories in the src.txz
distribution. This can happen if the src/ tree checkout is
within its own ZFS dataset, and the 'snapdir' ZFS property
is set to 'visible.'

Approved by: hrs
MFC after: 3 days
X-MFC-To: stable/9 only

Exclude potential circular symlink

This does not occur with normal release builds but can happen when reusing
these release parts for other purposes.

Exclude potential circular symlink when creating src tarball.

Normal release builds are not affected by this but it can happen if using
these release bits against a work tree.

Sponsored by: ADARA Networks

Make sure not to tar up CVS directories if this ports tree is a CVS
checkout.

PR: bin/165868
MFC after: 5 days

- Clean up extra ${.OBJDIR}.
- Add ${IMAGE} for the supported image files. This fixes the install target
on FreeBSD/pc98.
- Use "mkdir -p" instead of "-mkdir" consistently.

Reviewed by: nwhitehorn

Restore functionality to pack several kernels into release. All
kernels specified by KERNCONF are built and packed into release.
The first one is packed into kernel.txz, all others to
kernel.CONFIG.txz.

The first one is installed on bootables in /boot.

Allow release generation from a WORLDDIR that is not /usr/src

PR: misc/159666
Submitted by: Test Rat <ttsestt@gmail.com>
Reviewed by: Nathan Whitehorn <nwhitehorn@freebsd.org>
Approved by: re (kib)

Per request of the docs team, install docs as packages, instead of via
the normal distfile mechanism. Thanks to Marc Fonvieille for the patch and
for putting up with me taking entirely too long to commit this!

Submitted by: blackend

Make the bootonly CD smaller by discarding static libraries that are not
useful without a toolchain.

Do not install the rescue tools onto the install CD. Since it is read
only, they are very unlikely to be needed and take up a great deal of
space.

As requested by many people, with final prodding from Jason Hall, fix this
so that running make release causes make obj to be run before doing
anything. This fixes a bug wherein, when run for the first time, and
without -DNOSRC, make release would attempt to recursively tar up the src
directory including its own output and enter an infinite loop.

While here, make the cross-building stuff work a little more the way it
should if only one of TARGET/TARGET_ARCH is specified.

Mention the memstick target here.

Add an install target to release/Makefile instead of grubbing around
(and requesting that users grub around) in /usr/obj. Also make sure that
make clean removes the bootonly media and clean up that target a little.

Add infrastructure for generation of boot-only ISO images. These have a
reduced world, though still reasonably complete for fixit purposes.

Cause the release target to set up its object directory. It is designed
to be a meta-target, and having it do this avoids it spewing files all
over the source tree by default (and possible recursive tarring if
distributing a src tarball).

Use labels to find release media instead of hard-coded device paths. This
makes booting more reliable (and working at all on USB sticks). While here,
move responsibility for setting up fstab into the various platform mk-*.sh
scripts.

Suggested by: many

Thanks to sysinstall for its 15 years of service. And now to sleep,
perchance to dream...

Improve the distributeworld target in Makefile.inc1 and update the release
infrastructure to use it. make distributeworld can now be used without
preparing its environment first and installs games into its distribution
using the regular make distribute logic instead of post-processing with
a script.

Also add two new targets, packageworld and packagekernel, that tar up the
results of distributeworld and distributekernel (also new), respectively.

Get powerpc64 install CDs a little closer: some powerpc things should be
used on powerpc64 as well (build scripts, for instance), and the MFS root
must be adjusted upward on powerpc64 as well.

This doesn't completely solve things: sysinstall stil needs some
persuasion to deal with a default kernel named GENERIC64.

Connect powerpc64 to the build. It is not presently part of make universe,
which will be added soon.

Reviewed by: imp

Shift the version of perl used by the release build process over to
perl-5.10. This aligns the release build process with the current
default version of perl in the ports tree.

I'll MFC this to all active branches.

MFC after: 3 days

Pass the HTTP_PROXY and FTP_PROXY environment variables through in addition
to FTP_PASSIVE_MODE so release building works for a machine that needs
to use a proxy.

PR: misc/137688
Submitted by: Michael Leun
MFC after: 2 weeks

Do kgzip to the loader on pc98, too. Now pc98's boot2 works for ELF.

MFC after: 2 week

Add "FreeBSD-" to the beginning of the filenames for the ISO images.
People who collect ISOs from more than just us have been requesting
this for a while.

MFC after: 1 week

Have sparc64 join the separate livefs crowd. Including the docs packages
on disc1 (needed now by sysinstall) overflows the target CDROM iso size.

MFC after: 3 days

Update some comments to match the removal of the docset compilation
during the release build.

Invoke the recently added mm-mtree.sh release script to store a pre-built
mergemaster mtree database in the 'base' dist.

MFC after: 3 days

Fix a few issues with the lib32 dist so that it includes ldd32.
- Use a better find invocation to purge empty directories from all the dist
trees during a release build. The previous version did not purge
directories whose contents were all empty directories.
- Explicitly blacklist a few files from the lib32 dist instead of using a
whitelist. A better longterm solution is to fix the few offenders to not
install data files during a lib32 install.

MFC after: 3 days

Make head 9.0-CURRENT in preparation for lifting code freeze.

Approved by: re (implicit)

Add the ability to build a release from an SVN checkout instead of a CVS
checkout. If SVNROOT is specified, then the source tree will be checked
out from that SVN repository instead of using CVS. ports and docs still
use CVS. If SVNROOT is not specified, then the source tree will be checked
out using CVS. An explicit SVN branch can be specified using SVNBRANCH
(e.g. SVNBRANCH=stable/8). If SVNBRANCH is not set but RELEASETAG is set
to a CVS branch (such as RELENG_8) the appropriate SVN branch will be
inferred from the CVS branch using svnbranch.awk.

Note that there are still several open questions about using SVN instead
of CVS in the release process. However, this does enable one to build a
release from an SVN repository if needed.

Approved by: re (kensmith)

- release/* update to use freebsd-doc-* packages instead of building
FreeBSD docset during 'make release' this will speed up release
builds;
- sysinstall(8) has also been updated to use these packages with a new
menu allowing people to choose what localized doc to install;
- mention in UPDATING that docs from the FreeBSD Documentation project
are now installed in /usr/local/share/doc/freebsd instead of
/usr/share/doc.

Approved by: re (kensmith)

Make a DVD for ia64.

Restore MAKE_FLOPPIES for pc98.

Turn off the parallel make options accidentally turned on by the previous
commit. Sigh.

Noticed by: rdivacky

Turn off the building of boot floppies for amd64/i386.

This is being committed from a sparc64 (US-III, thanks Marius!) that
was installed from a DVD so apparently it works... :-)

Enable building DVDs for sparc64.

Move an echo that accidentally got put under the .if defined(MAKE_DVD).

Pointy hat: kensmith

Oops, add missing @.

The thought of making more than one DVD image for a release really
freaks me out. But it turns out we might be able to generalize
a few of the other things RE uses to assemble the package trees
for releases if the DVDs use a naming theme close to what is used
for the CDROMS (disc1, disc2, etc). So change the name to dvd1.
Hopefully this way src/release/scripts/{package-split.py,package-trees.sh}
can be generalized instead of copied-and-hacked.

MFC after: 5 days

Add a build knob MAKE_DVD to control on a per-architecture basis whether
or not to build a tree used for the creation of a DVD image. If that is
enabled set up a DVD tree by installing everything we normally install
to the individual CDROM trees into the one DVD tree. The result is one
image with all the install bits, livefs bits, and doc bits suitable for
burning to a DVD instead of CDROM.

Enable building the DVD for amd64 and i386.

MFC after: 1 week

When making release with NOPORTS, we'll checkout only the
mininal set of ports required to make the docs. However,
we also need ports/sysutils/cdrtools in order to make the
ISO images. When a platform doesn't have packages, the
release will fail in that case. Add ports/sysutils/cdrtools
to RELEASEPORTSMODULE for the DOMINIMALDOCPORTS case to
handle the NOPORTS release build.

Note that this change doesn't try to handle the NOPORTS with
NODOC case. For we have NOPORTSATALL set and it seems wrong
to check out a ports module in that case.

Enable GCC stack protection (aka Propolice) for userland:
- It is opt-out for now so as to give it maximum testing, but it may be
turned opt-in for stable branches depending on the consensus. You
can turn it off with WITHOUT_SSP.
- WITHOUT_SSP was previously used to disable the build of GNU libssp.
It is harmless to steal the knob as SSP symbols have been provided
by libc for a long time, GNU libssp should not have been much used.
- SSP is disabled in a few corners such as system bootstrap programs
(sys/boot), process bootstrap code (rtld, csu) and SSP symbols themselves.
- It should be safe to use -fstack-protector-all to build world, however
libc will be automatically downgraded to -fstack-protector because it
breaks rtld otherwise.
- This option is unavailable on ia64.

Enable GCC stack protection (aka Propolice) for kernel:
- It is opt-out for now so as to give it maximum testing.
- Do not compile your kernel with -fstack-protector-all, it won't work.

Submitted by: Jeremie Le Hen <jeremie@le-hen.org>

Don't use disklabel for the MFS root. The DoFS.sh script creates
a bogus partition table and puts the file system on the whole
partition. geom_part doesn't expose the 'c' partition as it's an
artifact of the BSD label and not to be used. Secondly, gpart(8)
is the preferred tool for partitioning disks on ia64.

Make it easier to experiment with alternate compression.

Reviewed by: kensmith

When compiled with the combination of flags used to build crunched
binaries for the fixit floppy bin/ed/main.c causes a gcc warning
message about argc possibly being clobbered by longjmp or vfork.
We have threatened to ditch floppies for 8.0 but I don't want to
do quite that much rototilling yet so for now turn off -Werror while
building ed (and everything else) for the fixit floppy.

Thanks to jb for pointing out NO_WERROR.

Remove kernel and module symbol files from disc1 (and the livecd if it
is enabled). This saves around 80MB (for i386) on the ISO images.

Note that this is only from the install media, not the installed
system where the symbols are still installed, if part of the release.

Should anybody want the symbols which match disc1/livecd, they can
just be extracted from the kernel distribution files.

Reviewed by: kensmith

The i386 disc1 size wandered above what fits on 650Mb media which has been
our target previously. So i386 joins the others that have switched over
to a separate livefs iso image.

pccard.conf is gone.

To honor the birth of RELENG_7 bump HEAD to 8.0-CURRENT.

Approved by: re (implicit)

Remove one more reference to the installation notes, this time in the
floppies directory.

Pointed out by: kensmith
Approved by: re (blanket for installation notes removal)

Don't copy the installation guide to the release media (i.e.
floppies or ISO images). We retain the concept of MD
release documentation for now, although it's fairly unlikely
that we'll ever do this again.

Approved by: re (blanket for installation guide removal)

The amd64 monthly snapshots began overflowing disc1 (and that's without any
packages...).

Reflect that the hardware notes is now an MI document.

Boot floppy for i386 overflowed during Jan. 2007 snapshot build, fix
it before Feb. 2007 snapshot build...

Teach release builds and release documentation snapshots that release
notes are no longer MD documents.

Move the documentation to its own separate disc to make room for more
packages on disc2. This will also let users decide if they want to
have a CD of the docs at all - unless they're disconnected from the
net they will probably find the Web site more useful.

Reviewed by: ru
MFC after: 3 days

Enforce RELEASENOUPDATE if EXTSRCDIR is used.

Suggested by: jb

The AUTO_KEYBOARD_DETECT is useful on amd64 as well.

Remove hint.atkbd.0.flags="0x1" from the installation device.hints;
kbdmux(4) is available during install and should take care of USB
keyboards.

Make it possible again to build -CURRENT snapshots on -STABLE.

Reported by: Angelo Turetta

Stop cutting the tarball names to eight symbols. This makes
it possible to e.g. distribute kernels with config names larger
than eight symbols, without the clash. Previousy, LALALALA
and LALALALA-SMP would be the same tarball. (I think this
comes from the old days where tarballs were put on the MS-DOS
formatted diskettes.)

MFC after: 3 days

Remove alpha left-overs.

When deleting empty directories prior to building the release tarballs,
pass the "-empty" flag to find(1). This change has no effect other
than to get rid of a few pages of "rmdir: ...: Directory not empty"
error messages. (Note that the "-empty" flag has been supported by
find(1) since 4.3-RELEASE.)

Make a bootable CD on pc98.

Fix the acpi.ko path for boot.flp.

PR: misc/96466
Submitted by: Nobuyuki Koganemaru
MFC after: 1 day

Assert that /dev/null is a character device in a chroot early. Otherwise,
we might get surprises later, like /dev/null having error in the 4th line
reported by make(1). :-)

Tested by: Dmitriy Kirhlarov (who attempted to make release in a jail)

make sure install scripts are executable

Submitted by: Ceri Davies

Convert NO_PROFILE and NO_LIB32 to new style.

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

Remove NO_SENDMAIL leaked from the days when building non-crypto
stuff for release was evil.

fix handling of default kernels

Reviewed by: ru

Fix this to what I've actually submitted.

handle KERNELS as before

Submitted by: ru, andrew

Revamp base system packaging of kernels to enable up/smp selection
at runtime and to support distributing additional kernels:
o remove kernel from the base tarball
o add new kernel tarballs
o build + package both SMP and GENERIC kernels when an <arch>/conf/SMP
config file is present
o add sysinstall support for multiple kernels
o update sysinstall to probe for the number of cpus on a system
and auto-select smp/up kernel accordingly
o add a post-kernels install hook to fixup /boot/kernel
o add -ldevinfo to boot crunch for sysinstall's cpu probing logic

Notes:
1. On HEAD this code is not currently used because GENERIC kernels
include SMP. This work is mainly intended for RELENG_6 where the
GENERIC kernel is UP. If HEAD changes to match then just enable
WITH_SMP in sysinstall/Makefile.
2. The cpu probing support is done with acpi and MPTable; this means
some systems will require work for auto-detection to work.
3. The handling of /boot/kernel may need to be revisited; for now
we rename one kernel at the last moment (SMP if installed, otherwise
GENERIC). There are other, possibly better, approaches.

Lots of help from ru, emaste, scottl, and jhb.

Fix a bug which puts an incorrect checksum of CHECKSUM.MD5
into the CHECKSUM.MD5 file itself.

Approved by: re (scottl)
MFC after: 3 days

Enable splitting up the MFSROOT floppy on amd64, the contents now overflow
one floppy's worth of space.

Fix the missing CD_VOLUME=1 in the cdrom.inf file on disc1 for the
livecd != disc1 case (i.e. ia64). The line was appended to the
non-existing cdrom.inf file, which was created only later. Move the
line to after the file is created.

MFC after: 1 day

Enable boot floppies for amd64. I just copied the needed variables over
from i386.

Tested by: Markus Trippelsdorf markus at trippelsdorf dot de
Approved by: scottl
MFC after: 1 week

Add EXTPORTSDIR like EXTSRCDIR and EXTDOCDIR.

PR: misc/83287
Submitted by: Gabor Kovesdan
MFC after: 1 week

Request boot floppy after loading mfsroot floppy because beastie.4th exists
in boot floppy.

Submitted by: Nobuyuki Koganemaru < n-kogane at syd dot odn dot ne dot jp >
MFC after: 1 week

Remove one more reference to usbd.conf.

Be cross-arch friendly.

Refactor (some more) installation of kernel and module objects.

Try to make everyone happy: David (to have debug kernels installed
by default), Warner (to be able to override that), and myself (for
actually making it all work and to be consistent).

Now, if kernel was configured for debugging (through DEBUG=-g in
the kernel config file or "config -g"), doing "make install" will
install debug versions of kernel and module objects with their
canonical names,

kernel.debug -> /boot/kernel/kernel
if_fxp.ko.debug -> /boot/kernel/if_fxp.ko

Installing a kernel not configured for debugging, or debug kernel
with INSTALL_NODEBUG variable defined, will install non-debug
kernel and module objects.

Also, restore the install.debug and reinstall.debug targets that
are part of the existing API (they cause some additional gdb(1)
scripts to be installed).

Add SHA256 checksums to the release build.

Requested by: cperciva (so)
Reviewed/improved by: ru
MFC after: 2 days

Unbreak release builds. Now that NO_INFO also affects the installation
of texinfo and we need makeinfo to build world, we cannot have NO_INFO
anymore when we populate the chroot.

Adjust for HEAD being 7.0 now.

Approved by: re (implicit)

Adapt the mfsroot environment of sysinstall to the needs of the new dhclient.
This involves having passwd bits available so that seteuid("_dhcp") work,
and creating /var/empty so that chroot(_VAR_EMPTY) works. My gut feeling
is that the better solution is to make privsep and chroot optional in
dhclient, but this works well for now and is low-risk.

Approved by: re

Provide 32-bit runtime support on amd64 as a separate distribution, lib32.

Prodded by: obrien
Nodded by: peter
Approved by: re

Make the liveCD separate ala ia64 - the combined live/install is
too large.

Strip the initial world some more.

Allow specifying which INDEX file to use by setting PKG_INDEX. By default
the INDEX file is taken from the package source tree as defined by the
PKG_TREE variable. This change allows using the (possibly incomplete)
packages on pointyhat.

MFC after: 2 days

- Move the doc project docs over to disc2 to free up some room for future
bloat on disc1.
- Output a message letting the user know that we are generating MD5 sums
during the long pause after the last mkisofs invocation in the iso.1
target.

MFC after: 3 days

What should be the last major changes to the ISO layout:
- When a separate livefs ISO is used, change the name of the tree directory
to be R/cdrom/livefs and change the name of the iso to livefs.iso rather
than using disc2. Instead, disc2 is now always going to be the packages
disc regardless of the presence of a separate livefs which makes things
simpler.
- Build a very simple disc2 tree under R/cdrom that just includes the
cdrom.inf file that the packages need. Also, build a disc2.iso image
in the iso.1 target. Disc 2's volume label is "FreeBSD_Packages".
- Retire CD_EXTRA_BITS and replace it with CD_PACKAGE_TREE. CD_EXTRA_BITS
was specific to disc1, but CD_PACKAGE_TREE instead should point to a
directory that has disc1 and disc2 subdirectories that contain the extra
bits for each image.
- Rename the bootonly volume label to "FreeBSD_bootonly" and just hardcode
the disc1 and livefs volume names and iso suffixes.

The live CD itself no longer has /stand since a long time ago; however,
there are still a couple of places under src/release such like fixit.profile
assumed that system binary can be retrivied from /stand(ex: boot with the
live CD and run "disklabel -e" in the fixit CD shell).

Since /stand is still functional in fixit floppy, and there are more than
one places in src/release needs to be updated(document for example) if we
want to make use of something like /mnt2/rescue/vi. This commit try to
deal with aforementioned inconsistency with minimal effort by simply
create a symbolic link to /rescue.

Reviewed by: jhb, sam (mentor)

Add a new package splitting mechanism to replace print-cdrom-packages.sh.
The new system tries to be more automated so that there is less work for
the re's to do. It also no longer uses a /usr/ports tree as its input,
but uses the generated package build including its INDEX file as its input.
It parses the INDEX file, determines which packages should go on which ISO
images, and then builds full-fledged trees of packages that can be added
as an argument to mkisofs along with the tree built by 'make release' to
build a full CD image. The INDEX files in the populated trees are
generated with volume media number to make use of sysinstall's multiple
volume support so that the user is kindly prompted to insert the
appropriate disc for a package if it is not on the current disc. There is
still some more tweaking to be done here, but this part needs to be
committed. This stuff will all be used to prep the 5.4 release as well.

Tested by: kensmith, others on re@
Reviewed by: re

When building release documentation for release builds or for
release documentation snapshots, force URLS_ABSOLUTE. This
allows us to relocate HTML renderings anywhere without worrying
about breaking relative links to pages on the Web site. This can
happen when we use &base; as part of a URL.

I wonder if we should do this for all release documentation builds,
but I'm not quite sure what all the cases are.

Always use a separate disc for the livefs on ia64 since the merged image
doesn't fit on one disc.

Tested by: marcel
X-MFC after: 30 seconds

Rework how we layout the CD/DVD ISO images for releases. Note that this
is only the first stage and does not yet handle packages (which will move
to their own disc(s)).
- By default, include the live filesystem on disc1, so that disc1 is now
both an install disc and a fixit disc. The images can still be split
into two separate discs by specifying SEPARATE_LIVEFS=yes.
- Remove /usr/ports from the live filesystem disc as the merged images
do not fit on even i386 otherwise. Also, the merged image already
contains a tarball of the entire ports tree, so /usr/ports was a
duplicate anyway.
- Stop building port READMES for the release sinc they are no longer used
(/usr/ports in the live filesystem was the last remaining user).
- Split cdrom.1 into three targets. cdrom.1 builds the live filesystem
image. cdrom.2 builds the disc1 image. Note that if SEPARATE_LIVEFS
is not specified these both write to the same area. cdrom.3 builds
the bootonly image and the UFS miniroot.
- The various distribution directories are now in a <buildname>
subdirectory of disc1 rather than being in the root so that the merged
image's root is not quite as cluttered.
- The disc1 image is now called disc1.iso and we no longer build a
miniinst.iso image. If CD_EXTRA_BITS is defined, then the iso.1 target
will simply include those bits in the disc1 image that it builds.

MFC after: 1 day
Requested by: re (scottl, etc.)

Use the shiny, new top-level 'distribution' target when populating the
chroot area. This fixes make release of HEAD on systems that have a
/usr/src with bsd.endian.mk and a matching /usr/obj but haven't installed
the world in /usr/obj and thus have no bsd.endian.mk /usr/share/mk.

Safer version of the chflags command.

NOCLEAN -> NO_CLEAN
NOCLEANDIR -> NO_CLEANDIR

NOHTML -> NO_HTML

NOGAMES -> NO_GAMES

NOSHARED -> NO_SHARED

NODOCCOMPRESS -> NO_DOCCOMPRESS
NOINFO -> NO_INFO
NOINFOCOMPRESS -> NO_INFOCOMPRESS
NOLINT -> NO_LINT
NOPIC -> NO_PIC
NOPROFILE -> NO_PROFILE

Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by: core

Actually put hint.atkbd.0.flags="0x1" in /boot/device.hints on CD-ROMs.
(Brought to my attention by Brooks while sitting together on the floor
in "Kairo".)

Pass WORLD_FLAGS down to the distributeworld target, so it's
possible to build releases with customizations such as with
NOPROFILE.

Problem found and fix tested by Roman Neuhauser.

It turns out the ia64 architecture's disc2 overflows if we put the
ports/ tree on it. This makes putting the ports/ tree on disc2 at
all dependent on the NOPORTREADMES knob as well as the NOPORT knob
(at the moment NOPORT may be set while NOPORTREADMES isn't, that
should probably be revisited). And it hardcodes ia64 for NOPORTREADMES
by request the ia64 release builder.

While here really get rid of the temp file 'make index' leaves behind.

Tested by: i386 and ia64 'make release'
Reviewed by: marcel
MFC after: 1 day

Fix-ups for a few problems reported with how ports are handled in the
release:

- run 'make index' as part of release build, INDEX* files in
CVS no longer updated and likely to be removed from CVS soon
- don't include README.html files in ports.tgz tarball because
they cause cvsup problems for users later
- put a copy of /usr/ports on disc2 that does include README.html
files so users have access to them

Reviewed by: ru (found one bug, several clean-up suggestions)
Tested by: 'make release'
MFC before: BETA6 build (this isn't likely to be tested in -current
anyway...)

Don't attempt to install the (obsolete and disconnected) Early Adopters
Guide on release media.

The early-adopter doesn't exist in HEAD anymore. The source is there,
but it's disconnected from the build. Remove it from the architecture
independent release documentation set, because it breaks "make release"
when NODOC is undefined.

Reviewed by: hrs

Use "cp -f" instead of "rm" and "cp" to break the hardlink to
device.hints.

Submitted by: ru

Add 'hint.atkbd.0.flags="0x1"' back to /boot/device.hints on the
install media on i386 and amd64. While the current default is very
useful in server environments, the ability to use USB keyboards is
vastly more important then the ability to use PS/2 keyboards the admin
forgot to plug in during the install process.

PR: kern/71443

Correct a typo in a comment.

Submitted by: Xin LI

Document the following knobs: CD_EXTRA_BITS, EXTRA_SRC, HTTP_PROXY
and FTP_PROXY. Removed bitrot (BOOT_CONFIG).

PR: misc/71465
Submitted by: Jon Passki <cykyc@yahoo.com>

Start the de-orbital burn of our previous FreeBSD version compat libs
living in usr/src. We need to use them from ports to record dependencies.

Discussed with: re(scottl)

Fixed the shell arithmetic to work with 4.x /bin/sh.

Tested by: make release of HEAD on 4.10-STABLE

Meet the new era of 6.0-CURRENT.

PPC definitions required for 'make release'

Reviewed by: ru
Submitted by: ssouhlal

Bring back 'NO_FLOPPIES', but as a user external knob.
The internal logic knob remains MAKE_FLOPPIES.

Suggested by: ru

Follow 'MAKE_ISOS' in naming and s/FLOPPIES/MAKE_FLOPPIES/g

Submitted by: ru

Accept the fact that floppies either aren't applicable or relevant on most
platforms. So make the floppy logic easier to read.

Now that make(1) passes variables that were given on the command line
to subordinate make(1) invocations through MAKEFLAGS, we cannot add
CFLAGS onto the make(1) command line. This will conflict with the
individual makefiles wanting to append to it, which is not respected
when CFLAGS is given on the command line. Hence build breakage.
So, put CFLAGS in the environment instead.

Clean up after mechanical renumbering.

Crypto is now part of the "base" distribution, and the old "release.3"
target no longer exists. Renumber the old release.[4-9] targets to
release.[3-8].

Reminded by: ru

Join the 21st century: Cryptography is no longer an optional component
of releases. The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by: re (scottl), markm
Discussed on: freebsd-current, in late April 2004

Remove some serious foot-shooting potential from the release Makefile. For
some unknown reason, when LOCAL_PATCHES and LOCAL_SCRIPT were originally
added, they were silently ignored if the actual file did not exist. As a
result, if one mistyped the pathname to a patch or script, then the release
silently succeeded. However, it was not built with the desired changes and
no warning was given to inform the builder either. This commit explicitly
checks to see that all of the defined patches and scripts exist up front
and bails if any of them do not exist. I lost several hours of valuable
sleeping time this evening due to this "feature" so I've finally gone and
ripped out. I've tripped over this in the past several other times as
well.

Glanced at by: scottl

Die if make buildworld fails -- don't wait 'till installworld can't find
what it needs.

Add URLS_ABSOLUTE=YES into the doc.1 target.

Sorry for doing this backwards, but as with most release related stuff
we only pay attention to it during release time and at the moment it's
a -stable release in progress.

This is a MFS I guess, moving rev 1.536.2.113 to HEAD. I ran out of
time to follow through with doing this last night. Sorry for the delay.

Adding a couple of variables to make tweaking the CD-ROM label and .iso
filenames easier.

- Only build a fixit floppy on i386 and pc98.
- Reenable boot floppies for Alpha.

- Use a stock loader with forth support on the boot floppies.
- Use the regular forth scripts including the stock device.hints file on
the boot floppies.
- gzip all the various text files on the boot floppy that are larger than
one sector to save on space.
- Generate a loader.conf to load the kernel, acpi.ko, and mfsroot making
use of the 'module_before' variables to prompt for a floppy to be entered
when required and use a stock loader.rc. This enables the beastie menu
on i386.
- PC98 has been changed to split the mfsroot for now so that the floppies
fit. When the PC98 bootstrap is updated to work with ELF files (which
needs to happen anyway), then SPLIT_MFSROOT can be turned off for PC98.

- Tweak order of arch fs options to stick all floppy options together and
all MFS root options together and in the same order on all archs.
- Drop support for using the no longer existing 2.88 floppy image for CD
booting on i386 via the EMUL_BOOT variable.
- Use a stock loader on the boot floppy rather than one without forth.
- Force the gzip of the mfsroot in release.9 to succeed. This is useful
when doing lots of rereleases when testing floppy changes.
- If an acpi kernel module exists, stick it on the boot floppy and for
now always load it after the kernel.

Two nits from rev. 1.835:

- Fixed spelling of NO_FLOPPIES to unbreak snapshot building on
architectures that don't support them (as installation source).

- Don't rely on CVS setting execution bits on the shell script.
(This is also consistent with the rest of this makefile.)

Reviewed by: jhb

The name of small boot floppy should be boot-small.flp to avoid conflicting
normal size floppy.

Reviewed by: jhb

Revert revision 1.833 -- the reinstallkernel.debug target calls the
installkernel.debug target (in the kernel build directory) which is
only defined if the kernel was configured for debugging which it is
not the case for GENERIC kernels on release branches.

Only i386 and Alpha have the compat4x distribution.

Overhaul our boot floppy generation system so that it scales better and
requires minimal care and feeding for future releases.
- Consolidate multitude of floppy related constants down to a normal
FLOPPY set for 1.44 floppies and on PC98 a SMALLFLOPPY set for 1.2
floppies. Also, cleanup the i386 arch section by not duplicating
constants that are the same on both machine types (i386 and pc98).
- Update the ZIPNSPLIT macro to generate a file chunks that will actually
fit onto 1.44 floppies formatted with UFS1. Unfortunately, split(1)
seems to be somewhat buggy, so the files generated are slightly larger
than the argument passed to split.
- Split the release.10 target into 3 targers: floppies.1, floppies.2 and
floppies.3 that are added to EXTRAS only if NOFLOPPIES is defined.
floppies.1 builds the install floppies, floppies.2 builds the fixit
floppy, and floppies.3 generates the md5 sums and READMEs for the
floppies/ directory.
- Drop the by now largely obsolete and less useful boot.flp picture. This
was more useful when the mfsroot lived inside the kernel rather than
being loaded from a separate file by the loader.
- Only build a single mfsroot containing no modules that is used for all
installation methods.
- Use split-file.sh to split up a gzipped GENERIC kernel into however many
floppies it takes for the boot kernel. Currently, a stock 5.2 GENERIC
kernel including WITNESS, INVARIANTS, DDB, and other assorted bloat fits
onto 2 additional floppies besides the boot floppy with some room to
spare.
- If SPLIT_MFSROOT is defined, the mfsroot.gz file is similar split into
however many floppies are needed. Currently it is not defined as the
mfsroot.gz fits onto the current boot.flp with room to spare.
- Add a 'makeFloppySet' target which builds a floppy set for a file that
was split using split-file.sh.
- Rename the doMFSKERN target to 'buildBootFloppy' as that more closely
matches what it does now. We no longer build a custom BOOTMFS kernel for
each boot floppy.
- We no longer build a 2.88 boot.flp image to use with emulated CD booting.
The non-emulated cdboot works for almost everyone who boots off of CD and
if it doesn't work on a particular machine, the user can always boot from
the 1.44 floppy images.
- We no longer build a driver floppy or stick kernel modules in the mfsroot
since we now use a stock kernel when booting from floppy.

- Run makewhatis(1) in etc/Makefile at the end of "install".
- Removed redundant and undocumented NO_MAKEDB_RUN knob.

Use the reinstallkernel.debug target, now that we have it.

Fix "5.x release on 4.x box" support.

It is required to check /etc/rc.d/ldconfig before use, because
${CHROOT} sandbox is sometimes 4.x world. If /etc/rc.d/ldconfig
is not there, run ldconfig(8) directly.

Discussed with: imp, obrien, ru

Once upon a time we had both "crypto" and "krb5" distributions,
and rebuilt some bits with crypto but without Kerberos support
(most notably SSH) during "make release", to put them into the
"crypto" distribution.

Now that we don't ship the separate "krb5" distribution anymore
(it's now part of the "crypto" distribuion), don't waste time
recompiling SSH bits without crypto and without Kerberos support
in an attempt to put them in the "base" distribution -- it just
doesn't work as SSH always uses crypto code.

We avoid this by not rebuilding KPROGS from kerberos5/Makefile in
release/Makefile and adding "libpam" to SPROGS in secure/Makefile
to ensure it's still rebuilt without crypto support for the "base"
distribution. (Disabling crypto (NOCRYPT) also disables building
of Kerberos-related PAM modules, and it's OK to depend on this.)

This should be a no-op change saving some "make release" time.

MFRELENG_5_2: Default the snapshot versioning to 5.2.

PR: misc/61402
Submitted by: Chris Knight

Add missing '\' in previous change.

* if-like-constructs now use <TAB>body consistently.
* Long statements with '\' continuation now use <4 spaces>continuation
consistently.
* wraps some long lines
* More consistent on how very simular repeated commands are wrapped.

Use /etc/rc.d/ldconfig script rather than the ldconfig command directly.

Submitted by: matusita

Run ldconfig in the chroot environment to find shared libraries in
/usr/local/lib.

Automatically generate the CHECKSUM.MD5 file for ISO's.

Approved by: scottl

Generate minimal /etc/group file for mfsroot tree.

This fixes newfs failures at installation.

Reviewed by: re (scottl)

Fix ${LOCAL_PATCHES} (chdir was ignored).

Combining "all" and "install" in one invocation is a very bad idea as
conditional evaluation is done only once in this case, and this may
not account for the fact that some conditionals would be evaluated
differently if "all" has already been run, like is the case with the
loader.help existance check in sys/boot/alpha/common/Makefile.common,
beforeinstall target. This should fix Alpha snapshot builds.

Correct the description of what the release.3 stage does nowadays.

Make LOCAL_PATCHES accept multiple patch files, as its name suggests.

For boot floppies, build a lightweight version of loader(8)
without Forth support. Saves 28K of kern.flp and boot.flp
on i386.

Reviewed by: jhb

2nd part of making the name of the release running script overrideable.

Make the name of the release running script overrideable.

Added the new knob MINIROOT that, when set, causes the creation
of the bootable UFS image, miniroot.ufs, fully identical to the
contents of the "bootonly" CD-ROM. The image is made available
on FTP as miniroot/miniroot.ufs.gz, for resemblance with NetBSD.

This replaces the boot.flp image for sparc64, making the latter
as coming with NO_FLOPPIES.

Reviewed by: jhb
Tested by: hrs

- Eliminate the "rm" command that was causing us trouble in rev. 1.799.

- Normalize doRELEASE to avoid seeing "`ftp.1' is up to date." warning
when doing "make rerelease", and ftp.1 was already built.

Reviewed by: jhb

- Unbreak Alpha snapshots (we were still attempting to build a
no longer existing "fixit" crunched binary).

- Simplify the CRUNCH_TARGETS variable's initialization.

- Simplify the release.5 logic a bit by accounting for the fact
that release/*_crunch.conf files were removed two years ago.

Back out LC_ALL=C since tr here supposed to run under clean env -i
environment always.

Pointed by: ru

LANG->LC_ALL

Pointed by: ru

Prepend LANG=C to all tr 'a-z' 'A-Z' and vice versa.
Note: this is POSIX requirement, c-c ranges are portable only in POSIX locale

- Removed vestiges of the IA64 boot floppy support.
- Fixed the bootable CD-ROM support for IA64.

Reviewed by: marcel
Tested by: marcel

- Boot-only CD-ROM support (bootonly.iso).

Submitted by: jhb, ru

- Moved the creation of the ports distribution to release.7.
- Call MFS root floppy mfsroot.flp even on a small PC98 disk.

Submitted by: jhb

Reviewed by: ru, jhb

From now on, Alpha releases will come with NO_FLOPPIES.

Approved by: consensus on freebsd-alpha

A replacement (miniboot.iso) is currently under development.

Revert last delta, sys/conf/kern.pre.mk,v 1.33 does the job.

OK'ed by: scottl

The -Os kernel build with GCC 3.3.1 also requires -fno-strict-aliasing
to survive.

Discussed with: bde
Tested on: i386 and pc98

Initialize the FIXCRYPTO, BINMAKE and related variables (that use
the != operator) only when needed.

This change allows me to check out the current version of release/
makefiles only (co -l) to /tmp/release, and use that directory to
build a release (supplying the correct WORLDDIR).

Without this, attempt to "make release" caused an endless fork bomb
while trying to evaluate FIXCRYPTO, and the only way I could get
away from this on a remote box was to "kill -INT 1", thanks to
tcsh(1) and its internal "kill" command.

Embed a simplistic version of the dokern.sh script directly into
release/Makefile.

Reviewed by: marcel

The original patch also removed ia64/dokern.sh, but this was OBE.

Moved the MFS root floppies creation code from release.10 to
doMFSKERN (where it logically belongs).

Make IA64 a second port that comes with NO_FLOPPIES.

Reviewed by: marcel

Bah, I go and get all preachy, and then commit from the wrong branch. Revert
the use of '-j8'.

Apologies to: ru

Fix the release build with a forgotten '-f'.

Make the PC98 small boot floppy usable again.

Spotted by: nyan
Reviewed by: nyan

The RELEASE9 knob is now OBE.

OK'ed by: jhb

Moved the boot floppy generation code out from release.9 to release.10.
The release.9 target is now responsible only for generation of MFS root
file systems, that are built for all architectures, even those that do
not provide a floppy installation option. The release.10 target is now
responsible for creation of a set of boot, MFS root, and fixit floppies,
and the NO_FLOPPIES variable now affects only this target.

Also, replaced the FIXIT_TARGET variable with a check of whether the
*FIXITSIZE variables are present for a given architecture, similar to
how this is done when generating boot floppies.

Discussed with: jhb

Get the correct set of cryptographically-infected binaries
automagically from the (secure|kerberos5)/Makefile:[KS]PROG.

Replaced the hardcoded target names in the touch(1) commands with
${.TARGET}, to ease maintenance.

Added the (undocumented) EMUL_BOOT variable (for TARGET=i386 only)
that causes the bootable ISO images to be created using the floppy
emulation (the old method) as opposed to the new "cdboot" method.

Only copy boot.flp to the 2nd CD-ROM if this variable is defined.

Reviewed by: murray

Added the WORLDDIR variable (defaulting to ${.CURDIR}/..) that
points to a directory where "make buildworld" was run. Useful
for building 5.x snapshots on 4.x.

Make NO_FLOPPIES really mean "no floppies", including not even
creating the "floppies" directory on FTP and CD-ROMs. Enforce
NO_FLOPPIES on amd64.

Tested for: amd64, i386 with -DNO_FLOPPIES

Revert revision 1.788, and explain a bit the intent of having
the boot.flp image on the second CD-ROM.

Explained by: jhb
Desired by: vendors

Do not define BIGBOOTSIZE and the friends for amd64; it serves
no useful purpose other than wasting CPU time in "make release"
creating useless boot.flp.

Desired by: peter

/floppies/boot.flp is no longer necessary on bootable i386 CD-ROMs.

Forgotten by: jhb

Fixed the last-minute bug I made in previous commit.

Fixed style bugs related to parentheses in Makefile.inc1.

Submitted by: bde

Fixed nearby bug: propagate the root Makefile's idea of
the appropriate "make" binary down to release/Makefile.

MFRELENG_5_1: Default the release makefile to 5.1.

Be laconic.

Add amd64 support

TARGET_ARCH == amd64 also has /boot/mbr.

Have the port readmes follow the same logic as buildworld. We skip
doing make readmes if /tmp/.skip_ports exists. This file is created
after a complete run, which avoids that we do the lengthy operation
again for a rerelease.
When NOPORTS or NOPORTREADMES are defined, we create the file prior
to starting the release.

Add some missing items to the make clean target.

Remove alpha-specific floppy build target for now.

Approved by: re(jhb)

Move the isp driver back to the alpha BOOTMFS kernel, and trim the size
of inodes for the alpha driver floppy. With this patch, alpha actually
built a full release!

Submitted by: ru

For EXT*DIR, use -H in addition to -R, so that a symlink may be
used in the EXTSRCDIR case, for example, if one finds it useful
to symlink /usr/src to an actual source tree, and use /usr/src
as the EXTSRCDIR.

This has no effects on release builds not using external directories.

Reviewed by: ru
Approved by: scottl (re)

disklabel(8) is spelled bsdlabel(8) or sunlabel(8) these days.
Also make sure bsdlabel(8) (along with the disklabel(8) compat
link) still appear on the fixit floppies of platforms that use
it natively (alpha, i386, and pc98).

Approved by: re (scottl)

release.9 has become the biggest festering pile of spaghetti s(*^% code.
Duplicate the target for Alpha so I can start hacking and slashing bits out.

Approved by: re(blanket to make Alpha build)

Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.

Move the setting of the BOOTABLE flag outside of .if MAKE_ISOS so that
bootable CDs can still be created if the iso.1 target is called
directly.

PR: misc/47191
Submitted by: Joost Bekkers <joost@bps.jodocus.org>
MFC after: 1 week

KerberosIV removal. Also crunch down the "krb5" distribution into
"secure".

Removing comment in some text files for fixit floppy overflow.

Approved by: re (murray)

Presumably fix sparc64 "make release". (The breakage was due to
sunlabel(8) no longer being linked to disklabel(8).)

Reviewed by: phk

continuation not needed

Don't play with MAKEFLAGS in one other place too; it's dangerous.

Makefile.inc1 rev. 1.341 broke release.5 -- the fuss with MAKEFLAGS
here interferenced with one in Makefile.inc1. Since we can't avoid
the jugglery in Makefile.inc1 (we want -m /usr/src/tools/build/mk
to come first, before any other -m specified on the command line),
avoid it here.

Reported by: imp

Revert revision 1.639 -- the "nodev" mount(8) option restriction
does not apply to ${CHROOTDIR} file system since revision 1.712.

Strip the .comment section out from the BOOTMFS kernel.

s/loaded as a module/available as a module/g

Submitted by: ru

Use the target arhitecture's disktab(5) file.

Pass the target machine architecture down to disklabel(8).
Do it so that systems without the -m option in disklabel(8),
e.g. 5.0-RELEASE, can still build current snapshots.

While here, drop the -s option from doFS.sh; we have not
been using the .size files for a long time.

In rev 1.603 I should have changed it to mdconfig rather than remove it.
I don't recall now, but for some reason I didn't think it was needed.
Also place the mdconfig right before the chroot call, to make it stand out
this needs to be done in the standard environment, as we've tried doing it
in the chroot environment before.

Unbreak iso.1.

Use positive logic rather than harder-to-read negative logic.

Make PREFETCHDISTFILES the default. Set NO_PREFETCHDISTFILES if you don't
like this. Also make it easier to issue the distfile fetching on command.

Add PORTREADMES_FLAGS which can really speed up the build on SMP machines
when set to -j<3*#CPU's>

KerberosIV de-orbit burn continues. Disconnect from "make release".

o Run make readmes (ports) from within CHROOTDIR to avoid pollution
and/or breakages due to /etc/make.conf on the host. Move it after
make world and put it in an if-block so that we can include the
commands in the script even if we're not going to make the readmes.
o When building docproj, make sure we propagate the setting of the
FTP_PASSIVE_MODE environment variable. Not propagating the envvar
may cause fetch failures. This increases the number of cases for
which one does not have to prefetch the packages.

If we are told to update the sources in "make rerelease", we also
probably want to re-buildworld.

If we are not going to rebuild (make rerelease -DRELEASENOUPDATE
and the file ${CHROOTDIR}/tmp/.world_done exists), do not touch
${CHROOTDIR}/usr/src/sys/conf/newvers.sh, as the only effect that
is has is upsetting release.2. Hey, have you ever seen this
"touch: not found" during rerelease? :-)

At least we don't need the whole <bsd.prog.mk> glue.

(I did test build the original change, but apparently
forgot to include it to LOCAL_PATCHES. It happens.)

mk file needed for 'make obj' done by $CHROOTDIR/mk

Fixed synopsis.
Mention that md(4) should be active (from release(7)).
Yet, this has nothing to do with bsd.prog.mk.

Pass FTP_PASSIVE_MODE, FTP_PROXY, and HTTP_PROXY variables to chroot sandbox.
These variables will be used by pkg_add, which installs mkisofs package
while MAKE_ISOS=YES. See src/release/${arch}/mkisoimages.sh if you doubt.

No objection heard from: current@FreeBSD.org
Suggested by: des, nectar (about *_PROXY variables)

Run kgzip(8) in a right environment and pass it the correct loader object.

Part 2/3 of unbreaking cross releases:

Use the right strip(1) binary.

Use checksum-recursive rather than fetch-recursive-list in PREFETCHDISTFILES
so as to catch errors ASAP rather than later between the ports cvs checkout
and docs cvs checkout. If a distfile doesn't checksum OK, it is very
hard to restart the release with "make rerelease" as that target assumes
all the cvs checkout's happened OK, and if that is not the case the cvs
update that is attempted fails..

Fix 'make release' from erroring out if this is an arch without driver
floppies.

Submitted by: nyan
Reviewed by: jhb

If there is a driver floppy for this arch, then add a line to the loader.rc
on the boot floppies to set the 'driver_floppy' variable in the loader so
that it ends up in the kernel environment and sysinstall will prompt for the
diskette. Booting from CD-ROM does not use this loader.rc file, so folks
booting from CD to do an install will not be prompted.

X-MFC after: as soon as I finish committing to current
Approved by: re (blanket)

Make iso.1 more readable.

Backout phk's backout of obrien's change.

Hat: core

Reduce size of individual bits of the dists to 240640 bytes again
so snapshots can be installed.

I have no idea what breaks, but at least the passive FTP install
goes haywire.

Setup a symlink to the distribution name in the root of the first CD image
so that it can be used as a anon-ftp area.

Change 'mfsroot' filename in mfsroot-small floppies from 'mfsroot-small'
to 'mfsroot'.

This is MFC candidate.

Noticed by: Toru Morimoto <too@os.gulf.or.jp>

MFS: Split export list.

Split files into 1.44MB chunks rather than a tiny, high-ftp overhead size.

Approved by: rwatson

Strip out any .comment ELF sections from crunchgen'ed binaries.

Move the creation of the DRIVERS.TXT file to a more appropriate area
of this file, so it will be created for other platforms that use a
third floppy disk, not just i386.

Approved by: re

Add ${BUILDNAME} and ${TARGET} to the filenames of ISO images
generated during release builds.

For the most part, re@ was doing this manually before putting ISO images
on ftp-master, but not always. This should make naming more consistent
and descriptive.

Requested by: jason andrade <jason@dstc.edu.au>, hubs@
Approved by: re (rwatson)
MFC after: 1 month

Only create the DRIVERS.TXT file on i386 for now.

Approved by: re

Create DRIVERS.TXT file to describe the contents of drivers.flp.

Approved by: re

Add lib/libfetch and usr.bin/fetch to FIXCRYPTO since they need the crypto
libraries for SSL support.

Approved by: re (rwatson)

Export NO_CPU_CFLAGS and NO_CPU_COPTFLAGS to chroot.

Copy from ${EXTLOCALDIR} to ${CHROOTDIR}/usr/local if EXTLOCALDIR is defined.

Rework the checking out of the doc, src, and ports trees a bit to make it
more manageable.
- Add some helper variables (CVS_{SRC,DOC,PORTS}ARGS) to be used when
using CVS to checkout files. We stick release tags in these helper
variables if they are defined and then use only one cvs command instead
of two cvs commands with an .ifdef to choose between them.
- rm the old src/doc/ports directories as separate commands from the
CVS comands so that the rm commands don't need to be duplicated.
- Simplify the DOMINIMALDOCPORTS case by overriding RELEASEPORTSMODULE to
be ${MINIMALDOCPORTS} thus removing yet another nearly-duplicate cvs
command in an .ifdef.
- Add support for grabbing src/ and doc/ from external directories
specified via EXTSRCDIR and EXTDOCDIR instead of from CVS. The same
is not done for ports/ quite yet as the DOMINIMALDOCPORTS case is a
bit tricky.

The rerelease target scripts have not been changed to use the helper
variables yet, so there is still some room for improvement.

Submitted by: kuriyama (4)

Allow a person to specify NOCDROM to skip the cdrom.1 target during a
release build.

PR: 45300
Submitted by: David Yeske <dyeske@yahoo.com>

release.9 for ia64 cannot be currently cross-built -- gpt(8)
is built on ia64 only.

Don't ever disable ACPI on ia64. We cannot life without it.

o Introduce variable DOFS_SH to hold the path of the doFS.sh.
o ia64: Set DOFS_SH to point to an alternate version.
o ia64: Lower BIGBOOTSIZE from 120M (LS-120) to ~5M.
o ia64: Set BIGBOOTLABEL to efi so that we can check for it
in the alternate doFS.sh script. If the label is not efi, we
can invoke the generic doFS.sh.

Fixes to unbreak Alpha releases:

Strip ${RD}/mfsfd/stand/etc/defaults/rc.conf.

Don't copy loader.help to ${RD}/mfsfd/boot, it serves no useful purpose.

Removed the now no-op commands to copy ${RD}/trees/base/dev bits to
${RD}/mfsfd/dev, now that DEVFS is the default.

Removed UFS_ACL, PSEUDOFS, and COMPAT_FREEBSD4 options from the BOOTMFS
kernel.

Moved miibus network module to the drivers floppy.

isp(4) and mpt(4) now have corresponding modules, move them to the third
floppy as well.

Caution! With these changes, mfsroot.flp has only 11K left, and
kern.flp has even less -- 5K.

Make a small (1.2M) fixit floppy image for pc98.

Use ${TARGET_ARCH} for ia64 tests.

Move the modules in the mfsroot to /modules instead of /stand/modules so
that they aren't copied over into /stand of new installations.

Submitted by: matusita
Tested on: i386

Use ${RD}/trees/base/boot/loader for kern.flp instead of /boot/loader.

Add the necessary tweaks for FreeBSD/ia64 releases. Note that this is
in no way final. A typical ia64 wart is that there are no boot blocks.
Instead, we need to create disks with EFI partitions if we want auto
boot to work. All this functionality is not present yet.

Add CVSARGS for cvs arguments (vs. cvs subcommand arguments).
Allow the cvs command to be prefixed by using CVSPREFIX.

- Copy the mfsroot.gz file to /R/stage/mfsroot/ so that the CD-ROM layout
can fetch it from there instead of looking in the boot floppy's
directory.
- Add a NO_FLOPPIES variable that disables building of any boot floppies.

Tested on: alpha

Hook the early adopter's guide into the release build. Its basename
is "EARLY", which is kind of an odd name, but I couldn't think of
anything better that fit the traditional 8.3 naming convention for
release documentation files.

Remove unneeded variables.

Make floppy-making part of release.9 conditional on *BOOTSIZE
rather than on "pc98" (rev. 1.710) and "sparc64" (rev. 1.711).

Nuke pccard.conf from FreeBSD/i386 mfsroot (no longer needed).

Suggested by: nyan

Fixups to get make release going again for i386:

o mount (and unmount) devfs in the chroot'd filesystem
o handle umounting devfs in case of a keyboard interrupt
o remove MAKEDEV from the fixit floppy so things fit again (mount_devfs was
added in a separate commit)
o explicitly remove mfsroot.gz and loader.conf when building the cd-rom area
as otherwice cp -Rp aborts when a previous run left identical files around
o increase the number of inodes on the drivers floppy; moving drivers from
the kernel there (to shrink it's size) caused things to overflow
o while we're increasing the driver's floppy inode config, separate out all
parameters from the boot floppy

Approved by: re

Add support for building sparc64 releases.

Reviewed by: murray

Fixed disk full problem for pc98 distribution. Now, it makes 4 installation
floppies.

kern-small.flp and mfsroot-small.flp are for old machines that don't
support 1.44MB floppy. These floppies don't have pci related devices.

kern.flp and mfsroot.flp are normal 1.44MB floppy images.

Pass -o option to crunchgen(1) to ensure object files end up
in seperate directories. This mostly affects RELENG_4 where
not doing so results in ${CHROOTDIR}/usr/src/release being
filled with object files, and "srelease" distribution having
them in.

PR: misc/43825
Prodded by: re (murray)

Don't make an error even if drivers.conf does not exist.

Tested on: snapshots.pc98.jp.FreeBSD.org

ALLLANG is long dead, garbage collect it. Instead, make it possible
to use DOC_LANG to specify which languages the doc/ is built for.

Note: be aware that the DOC_LANG setting in /etc/make.conf will now
take the effect on "make release". (This is probably the desired
behavior anyway.)

PR: docs/42924

Kernel MIB name for disabling ACPI was changed.

Pointed out by: iwasaki

Initiate deorbit burn for the i386-only a.out related support. Moves are
under way to move the remnants of the a.out toolchain to ports. As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL. It has already lasted WAY beyond
that.

Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.

Tested on: i386 (extensively), alpha

Use ${TARGET}/dokern.sh instead of ${TARGET_ARCH}/dokern.sh.
(pc98/dokern.sh is (repository) copied from i386/dokern.sh.)

Collapsed the export list, added CD_EXTRA_BITS to it.

Two more variables to export: KERNELS and AUTO_KEYBOARD_DETECT.

Submitted by: Alan Judge <Alan.Judge@eircom.net>

Remove a stray ';'.

Remove a '-' that is not needed.

Submitted by: ru

Add a third floppy to releases. It will only be built if there is a
release/${TARGET}/drivers.conf file which list drivers that have to
go into the third floppy.

Also shuffle i386/drivers.conf so that the floppies don't overflow
anymore. Anybody with real/better usage statistics is welcome to
shuffle it differently.

Reviewed by: ru

Stop eating all process memory if either of ${.CURDIR}/../kerberosIV
or ${.CURDIR}/../kerberos5 does not exist.

Spotted by: Alexandr Listopad <laa@reis.zp.ua>
MFC after: 3 days

The side effect of revision 1.687 (env -i) was that many useful knobs
are no longer propagated to the chrooted environment, e.g. NOKERBEROS.
On the other hand, TMPDIR and MAKEOBJDIRPREFIX should no longer be.

Spotted by: Alexandr Listopad <laa@reis.zp.ua>

Catch up to the rev. 1.694 changes; WITHOUT_X11 is not anymore set in
the environment.

If we are building docs with this release and PREFETCHDISTFILES is defined
then download the distfiles for the ports needed to build the docs before
we enter the chroot environment. This is useful since often times releases
get in a funk trying to download distfiles in the chroot.

Approved by: re (murray, bmah)
MFC after: 5 days

Build FDP ports with a clean runtime environment; gmake(1) somehow
uses ${TARGET_ARCH}, in a way that is incompatible with our usage.

Submitted by: jhay, ru

Braino in the 1.672 commit: scripts/games-make.sh expects the
"manpages" and "catpages" dists to be already built.

Copy the right dhclient-script(8).

Fix ${TMAKE} to use the correct .mk files.
Removed stray -DNO_WERROR's.

Do not override the CFLAGS with its standard value. At some point,
different architectures may choose to use different default values
for CFLAGS, for example. (It was added in rev. 1.200 as a measure
to make boot images fit the floppies, and was never reverted.)

Part 2/2 of the kerberos5/doc/ "make release" breakage fix:

Make sure the "krb5" does not have the /usr/share/info/dir,
or it will clobber the "base" version on install.

Fix a typo: s/und/and/

Not Reviewed by: re@

Set PATH statically, and use 'env -i' to kick chroot(8). As a result,
the second buildworld environment is fully isolated from parent's
environment variables.

Tested virtually on: snapshots.jp.FreeBSD.org
Approved by: arch@ (silently)
MFC after: 2 weeks

Explicitly set TARGET and TARGET_ARCH in a chroot sandbox.

In fact, these variable are set as environment variables since we run
"make TARGET=xxx TARGET_ARCH=xxx"; TARGET and TARGET_ARCH are declared
in the command line arguments. However, if you are not make(1) guy,
it is hard to understand that TARGET/TARGET_ARCH are appropriately set
in a chroot environment (as environment variables).

Now, the only environment variable need to be set explicitly is 'PATH'.
If we set PATH in /mk script, we can make pristine sandbox for release
build (i.e., "env -i /usr/sbin/chroot ${CHROOT} /mk" will work).

Valuable comments about this issue from: ru
Tested on (virtually): snapshots.jp.FreeBSD.org
MFC after: 2 weeks

Install MD documentations in ${TARGET} directory instead of ${TARGET_ARCH}.

Change the ">>> make release ..." output to also include ${TARGET}.

Fixed the nasty bug I introduced in rev. 1.671 that got
fatal in the previous delta. Repeat after me: exists()
is executed at parse time.

PC98 creates different BOOTMFS configs for different floppy sizes.

Broken in: rev. 1.672
Spotted by: nyan

Convert Perl scripts to awk(1).

Build ports needed for release documentation WITHOUT_PYTHON.

Split release.2 into two stages. release.2 now install the base
dist, while release.3 makes and installs crypto, krb4, and krb5
dists. This makes release.3 restartable (with "make rerelease").

Make sure the first ${CHROOTDIR} installworld is done for the correct
arch. This makes "make release TARGET_ARCH=foo" really work.

(I only tested with "make rerelease" before to save some time and did
not notice the problem.)

GC now redundant BOOTSTRAPUTILS stuff.

Milestone #2 in cross-arch make releases. They now work!

You need to set TARGET_ARCH and possibly TARGET, the same
way you normally do it for a cross build(7).

Renamed `distribworld' to a more natutal `distributeworld'.

Put pwd_mkdb(8) under ${INSTALLTMP}; for `distributeworld'.

Some components of the crunched binaries may use build-tools
that are to be run on the building host. (Currently, bin/sh
and usr.sbin/sysinstall use them.) Make sure we build them
in the correct environment, like we do it in the buildworld.

Introduce CVSCMDARGS make variable to set command-line options for cvs.
You may want set '-D data-spec' to this variable.

PR: 31218
Submitted by: Alexandr Listopad <laa@laa.zp.ua>
MFC after: 5 days
(if re@ permits)

If we are making a "release", we can obviously use -DNOCLEAN buildworld,
to save some time, because ${CHROOTDIR}/usr/obj does not even exist.

Milestone #1 in cross-arch make releases.

Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld. For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1. Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment. KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules. GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists. Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories. This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage. Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists? (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@sunbay.com>

Build the catpages distribution in a more natural way.

The chrooted environment isn't nearly pristine, so reset
MAKEOBJDIRPREFIX to the canonical /usr/obj while there.

Change the name of the 'bin' distribution to 'base'.
This is done since it contains much more than /bin, and also gets in the
way when making a combined install+fixit CD.

OK'ed by: jkh

Do not spam initial ${CHROOTDIR} world with Texinfo and HTML docs.

For rerelease, run "make -DNOCLEAN world" instead of simple and
insufficient in some cases "make all install". This is especially
true for cross-arch "make release"s which we don't (yet) support.

Set hint.acpi.0.disable to 1 in /boot/loader.rc of {boot,kern}.flp,
since we have no ACPI feature in the installation kernel at this time.

Without having this, we'll see

ACPI no autoload failed -- no such file or directory

message at boot time, and it makes some confusion to the users. We can
backout this change if installation kernel has ACPI feature.

PR: 36911 (partly)

Fix recent fixit.flp flood:
- don't make device files since we are in the DEVFS era.
(for the last resort, fixit.flp still has /dev/MAKEDEV.)
- increase FIXITINODE size to 10 times (40000).

After this change, we have 42kbytes of free space, and 38
of free inodes (confirmed with 5.0-CURRENT-20020327-JPSNAP).

Since 4-stable doesn't have DEVFS, we can't MFC this (except FIXITINODE).

Make it easier to specify a custom kernel configuration for the boot
floppies.

PR: misc/36032
Submitted by: David Yeske <dyeske@yahoo.com>
MFC after: 1 week

Bump MFSSIZE to the value used by i386 and pc98. This larger MFS
filesystem will still compress below the 1.44 megabyte threshold for
the floppy image.

Alpha does not support PCCARD installs, so we do not need the 58k
/etc/defaults/pccard.conf. Assume for now that only
MACHINE_ARCH=="i386" wants to do PCCARD installs. We're still using
too much space, but this is a big help.

Teach sysinstall(8) how to read boot managers out of /boot
instead of hardcoding them into the binary. This replaces
the work-around in usr.sbin/sysinstall/Makefile,v 1.121.

Suggested by: jhb
MFC in: 1 week

Remove all traces of write_mfs_in_kernel from the base system release
area.

Requested by: joe

Remind developers to update release(7) if they make substantial
changes to this file.

Supply -DNO_WERROR to the kernel build during release.

Typo fix: missing ;.

Pointed out by: Manfred Antar <null@pozo.com>
Pointy hat to: matusita

Mkdir ${CHROOTDIR}/usr/ports/distfiles if RELEASEDISTFILES is not set.
We ensure that 'ports.tgz' tarball should have ports/distfiles directory.

At first, ${CHROOTDIR}/usr/ports is empty (rm -rf ports), then extract
ports files from CVS repository. Then if RELEASEDISTFILES is defined,
${CHROOTDIR}/usr/ports/distfiles directory is created by cp(1). However,
if you don't specify RELEASEDISTFILES, there is no chance to create
${CHROOTDIR}/usr/ports/distfiles directory.

Submitted by: {ushi,tora}.jp.FreeBSD.org
MFC after: 5 days

Change variable name from DOCDISTFILES to RELEASEDISTFILES. Respect
DOCDISTFILES if defined. No impact should happen with this change.

DOCDISTFILES is introduced by rev. 1.541, to point the directory that
contains the distfiles for ports/textproc/docproj. It's good, but
we also build ports/sysutils/mkisofs during the release (if MAKE_ISOS
is defined). It is natural that cdrtools tarball is prefetched, then
copy it under ${CHROOTDIR}/usr/ports/distfiles.

As a result, DOCDISTFILES variable is somewhat abused for non-doc
tarballs; *DOC*DISTFILES is no longger appropriate name for that.

PR: 16843
PR: 34194
Submitted by: murray
MFC after: 6 days

In revision 1.351, All files/directories in ${CHROOTDIR}/usr/ports/distfiles
are removed, because ports.tgz includes distfiles by accident.

However, removing files/directories is *not* mandatory. The only
requirement is "ports.tgz doesn't include distfiles/* but distfiles
directory itself". If this is correct, the right way is to set an
option to tar(1), not to include these files.

This commit is based on PR: 34194, but a little bit of modification
is made by me (original patch doesn't include 'distfiles' directory).

PR: 34194
Reviewed by: Adrian Steinmann <ast@marabu.ch> (PR submitter)
MFC after: 9 days

MFS 1.536.2.52 (partial) and 1.536.2.70: kgzip loader if i386 (only).

5.0-CURRENT-20020121-JPSNAP was failed to build since kern.flp has no
space. There is already a hack to kgzip loader, and it makes:

-r-xr-xr-x 1 root wheel 163840 Jan 21 07:40 loader*
-r-xr-xr-x 1 root wheel 90121 Jan 21 08:06 loader.kgz*

73719 bytes of free spaces to us.

Include /dev/xpt0 into the list of devices to go onto the boot floppy, so
camcontrol can get a handle to initiate a rescan or reset.

MFC after: 1 week

Modify the release-building process so the srelease distribution
doesn't get spammed by RELNOTESng files.

Previously, we built the RELNOTESng files "in place" and then
populated the media (e.g. floppy, cdrom, ftp) areas from the build
directories. However, the distributions got rolled after the
RELNOTESng build, and thus picked up the rendered RELNOTESng files.

Now, we install the RELNOTESng documents to R/stage/release.doc, then
clean out the original directories in src/release/doc. We use the
renditions in the staging area to populate the media areas.

PR: 33141
MFC after: 3 days
(plus re approval)

At least I'm consistent. Back out the last accidental rev to this file on
HEAD too.

Noticed by: ben
Another pointy hat to: bmah

New release notes found while trying to catch-up RELENG_4 to reality:
whois(1) -c, pkg_delete -r, rc.conf(5) support for IPFilter state tables.

set TMPDIR to /tmp

Set a BOOTABLE variable to "-b" if MACHINE is not pc98, and use it for
mkisoimages.sh instead of "-b" directly.

MFC after: 1 week

PC98 boxes cannot boot from CD-ROM.

Search ${MACHINE}/drivers.conf instead of ${MACHINE_ARCH}/drivers.conf.
The previous commit is not completely.

Use a separate drivers.conf between i386 and pc98.

Switch to using a standard /boot directory including the GENERIC kernel
on CD's 1 and 2. Create a simple /boot/loader.conf on each CD that loads
/boot/mfsroot.gz as a mfs_root image. The mfsroot moved from /mfsroot.gz
to /boot/mfsroot.gz so that all of the boot stuff is in /boot. This allows
a full kernel to be used when installing from CD on all architectures
that support CD booting. Note that on x86, this requires using
/boot/cdboot as a no-emulation boot image instead of /floppies/boot.flp.

Increase the size of a mfsroot floppy for pc98 to 4320.

Bump the mfsroot up from 2880 to 3200 for Alpha so it fits again. Use
a label of auto instead of the fixed size minimum2 so that the bump in
size actually has an effect.

Use modules-depend instead of kernel-depend for doing the depend stage
in doMODULES.

Split the mfsroot out from the kernel for the 2.88 boot floppy and the
Alpha CD. This makes it easier to customize ISO's locally by being able
to replace either the mfsroot or the kernel w/o having to do both. It also
allows us to switch to using the full GENERIC kernel when booting from CD
on the Alpha and on x86 when using cdboot. We don't do this yet, however.

Tested on: x86, alpha

Add a comment that the chroot area cannot reside on a "nodev"-mounted
filesystem.

PR: 12712
Submitted by: Sergei Laskavy <laskavy@Berkeley.Gambit.Msk.SU>

Make CD-ROM distributions at the pc98 release target.

MFC after: 3 days

The README file in the floppies/ directory of a distribution should
come from the installation document (of the release documentation)
not the readme. The installation document is the one that has the
content of the old FLOPPIES.TXT.

Pointy hat to: bmah

'make release' should install docproj ports with BATCH=yes so that your
release builds don't stop in the middle of the night asking for user
input about which Ghostscript drivers to install.

Cause an error condition to be sensed by make(1) if we have trouble
making the ISO.

Use sh to execute scripts and just check that the script is readable.
I guess I pooched the permissions on the scripts before committing them
since they're not executable and now it's too late to change (I think -
I suppose you could chmod the ,v files and it might inheirit but I don't
feel like asking the repomeisters to try that).

Noticed by: Dirk Froemberg <dirk@freebsd.org>

+ back out my `iso' target
+ allows one to set _R so one can more easily make an iso after the fact,
in the directory `make release' was issued in
+ changes name from miniboot to miniinst since we make other bootable ISOs
also (and we might confuse someone)

Approved by: jkh

Add an `iso' target to create ISO images properly for each platform.

Add scripts and Makefile support for building ISO images automatically
as part of the release if MAKE_ISOS is set. Will also build the
first CD with packages (in addition to the "minimal" CD) if CD_EXTRA_BITS
points to them. This probably need a bit more work to get fully useful,
but it at least covers the basics for now.

dokern.sh was repo copied from src/release/scripts to
src/release/${MACHINE_ARCH}

Use quotes around ${RELEASETAG} to allow values like
-r RELENG_4 -D "2001-07-17 12:00"