MFreleng10 r259582 (reverse), MFstable10 r259491, r259492, r260781:

r259582 (reverted):
Set PACKAGESITE to 'release/0' for the pkg-stage target to pull
the release set of packages. (Required to eliminate conflicts.)

r259491:
Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.

r259492:
Add NOPKG to disable pkg-stage.

r260781:
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.

A change local to releng/10.0 sets the package fetch URL to
'release/0'.

Approved by: re (delphij)
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.

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

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
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 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

Fix 'make release' on older hosts: use buildworld legacy utilities.

Newer FreeBSD installs require an install(1) that supports the new flags.

This adds ${MAKEOBJDIRPREFIX}${.CURDIR}/tmp/legacy/{bin,usr/{bin,sbin}}
to the PATH while generating an mtree database for 'make release'.

Note that the problem only exists here because mm-mtree.sh generates
its own object tree to avoid mucking with the existing one, which
results in a PATH containing legacy utility dirs that are empty.

Farewall, sysinstall! You served us well for many years, but 10.0 is one
digit beyond your time.

Various sysinstall dependencies (e.g. libftpio, libdisk, libodialog, etc.)
will be cleaned up in coming days. Some will take longer than others due to
a few other consumers (tzsetup and sade).

Add generation of an installation manifest containing SHA256 checksums as
well as package descriptions and add code in the installer to check the
checksums.

Add generation of memstick images to the bsdinstall release makefile for
i386 and amd64. This involved moving the memstick generation script to
the arch directories from scripts/, in analogy to mkisoimages.sh. This
script was never called from /usr/src/release/Makefile, so that hasn't
been updated.

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.

Remove an unnecessary cat.

PR: 145447
Submitted by: u at netbeisser dot de
MFC after: 1 week

Provide a script that can be used to create the memstick images. For now
it isn't being integrated into 'make release' because for the forseeable
future the memstick images will be identical to what's on the DVD except
for which package set is provided. If/when what's on the memstick diverges
from what's on the DVD it would make more sense to generate a "memstick"
directory in $CHROOT/R/cdrom and build the memstick image along with the
ISO images.

Reviewed by: jhb, ru, Garrett Cooper (yanefbsd at gmail dot com)

Update package list for 8.0-REL.

Reviewed by: re@, portmgr@
MFC after: 1 day

Bring the layout of package-split.py more in line with where we're going
with packages on the release media. It looks like we'll be putting just
the doc packages on the new "memory stick" image as well as disc1. There
will be no other packages on the CDROM-sized media. The DVD sized media
will include the doc packages plus whatever other packages we decide to
make part of the release.

This commit just brings the basic structure in line with being able to
do this. We still need to discuss with various people exactly which
packages will be included on the DVD.

If the environement variable "PKG_DVD" is set a tree suitable for the
DVD media is generated. Otherwise a tree suitable for the "memory stick"
and disc1 is generated.

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

Add a script to create the /var/db/mergemaster.mtree file for new
releases so that when users subsequently update their source trees
they can make use of mergemaster's -U option.

- 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)

Specify 4096 block-size and 512 fragment-size.
This fixes no space error.

Due to some recent-ish work on GEOM/G_PART the c partition (by tradition
the whole disk) isn't available any more since it was redundant. Just
use /dev/md0 instead of /dev/md0c to build the filesystem on.

Consulted-with: marcel

Fix minor typo.

src/compat/ is gone back in March.

Reported by: Mars G Miro

Teach source installation shell script and sysinstall(8) about
the 'scompat' source dist that holds src/compat/.

Reported by: Mars G Miro

Catch up to changes in the ports tree since last release

Teach the 'src-install' script about the 'scddl' source dist that holds
/usr/src/cddl.

Approved by: re (kensmith)

Shift to vim-lite package because vim package doesn't build at the moment.

MFC after: 3 days

Alpha no longer supported.

Noticed by: ru@

Switch to emulators/linux_base-fc4 since that's the new default
Linux emulator.

MFC after: 3 days

Remove security/freebsd-update from package split; it's now in the
base system.

Pointed out by: kris

Catch up to xchat and samba package changes

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

Provide the installation script for the lib32 distribution.

Move some historical artefacts into the attic.

Allow the DESTDIR to be specified without a terminating slash
(all other install scripts allow this).

Cosmetics.

correct install location

Submitted by: Ceri Davies (slightly modified)

First pass at trimming package set down. Disc2 is still too big
even with this but we're still deciding exactly what to do about
that.

The ltmdm port is marked as NO_PACKAGE now.

kernel install script (missed in previous commit)

Remove the ports version of bsdiff - it is now in the base system.

Remove the ports version of portsnap - it is now in the base system.

It had been noticed disc2 was overflowing earlier but committing the
fix slipped through a crack. Remove the apache and php packages under
the assumption someone installing a Web server has network access and
doesn't *need* the packages on disc2.

This will be insta-MFCed...

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

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

Put gnome-lite and kde-lite on disc2 for ia64. The full gnome and kde
packages is causing the disc2 ISO to overflow in excess of 100MB.

MFC after: 2 days

Remove only the packages sub-directory before recreating it. Do not
remove the whole disc treei structure. This allows one to specify the
disc trees created by a prior release build (under R/cdrom) as the
destination without destroying the contents. This better integrates
with release building and makes further automation easier.

MFC after: 2 days

Needed to drop "lang/gnat", "print/teTeX", and "textproc/docproj-jadetex"
to make the packages fit on the CDs...

MFC after: 3 days

Remove the print/acroread package due to licensing concerns.

Requested by: trevor (acroread maintainer)
Seconded by: Mark Linimon, Joerg Wunsch
MFC after: 1 day

- Use the extend method of list objects to append a new list rather than a
bunch of append calls when adding more ports to an existing list.
- Remove the compatXY packages from disc1 as they are only intended for use
on 5.x (6.x doesn't have them as dists anymore) and on 5.x they aren't
packages but are old-fashioned distribution tarballs anyway.

- Always include x11/xorg on disc1 as it does exist for ia64 (I must have
misread print-cdrom-packages.sh).
- Include x11/xorg-manpages and devel/imake-6 since xorg doesn't pull those
in as requirements. Not including manpages is a bug IMO.
- Add security/freebsd-update to disc2, not sure why I left this one out
but I did by accident.

Reported by: kensmith (2), cpercival (3)

Retire print-cdrom-packages.sh as it has been replaced.

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

Add sysutils/portsnap onto the list of desired packages, since people
are finding it useful and it's only 10kB.

Due to space constraints, use gnome2-lite for i386 and gnome2 for everything
else. Also add ltmdm to i386 by popular request.

Seperate ia64 from the pack. The disc1 is overflowing to such extend
that most packages can not be included. It's much easier to list those
that we do want on disc1 for ia64. We only need to list 11 of them.

Apply proper indentation for better readability.

Fix typo in rev. 1.58 (missing $) that invalidated the conditional and
caused freebsd-update to be added to the ia64 package list.

The print/acroread4 port seems to be gone. acroread5 doesn't run on
Alpha so that leaves acroread (3). Users are probably better off
with xpdf so just drop acroread completely.

MFC after: 3 days

Don't put devel/gdb6 on disc1 for non-i386 platforms. We have gdb6 in
the base-system. Adding the port for ia64 on disc1 is especially bogus,
because the port doesn't even build on ia64. It also doesn't support
libthread_db.

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

Back out v1.57, the underlying problem that caused a delay between
mdconfig and the device name appearing in /dev seems to be fixed.

Allow MFS images to be built without a disklabel for releases
that don't require one i.e. PPC.

Reviewed by: ru
Submitted by: ssouhlal

Remove misc/screen, which is not packageable.

Shift to the same version of perl that portmgr@ has as their default.

Pointed out by: jhb

I should have marked my previous commit with an XXX to indicate it's a
workaround to a problem that shouldn't exist.

Noticed by: ru

Looks like the x.org manuals are in x11/xorg-manpages, not x11/xorg-manuals.

The compat2x and compat3x packages are not buildable due to security
issues.

I've had 'make release' problems on a large/fast dual processor machine
with doFS.sh consistently dying here because the device didn't exist
in the namespace fast enough after doing the mdconfig. But the device
did eventually show up. There have been similar complaints on mailing
lists that might boil down to this being the problem too.

This is obviously a hack, if anyone knows what might cause a delay
between mdconfig running and when the name appears in the /dev namespace
(inside a chroot-ed environment if that matters) I'd be happy to back
this out.

Crypto is now part of the base distribution. Remove crypto-install.sh,
and add scrypto, skrb5, ssecure into src-install.sh

Reminded by: ru

Update for conversion to X.Org as default X in -current.

Requested by: scottl

Improve package list for disc3:
xemacs21 -> xemacs, add apache13, apache2, and php packages to this disc.

Add security/freebsd-update back for non-ia64 releases. (The port is
currently marked ONLY_FOR_ARCHS= i386 amd64 alpha sparc64.)

Approved by: scottl

Added "rescue".

Submitted by: Kent Hauser <kent.hauser@verizon.net>

s/emacs21/emacs/
The emacs21 ports has been retired on March 21st and the emacs port
was updated to version 21.3.

Add security/portaudit to disc3.

Requested by: Xin Li <delphij@frontfree.net>

Force gdb6 into disc1 for amd64, sparc64, and ia64
(until they have /usr/src gdb support)

Remove freebsd-update -- it breaks the Alpha, sparc64, ia64, and amd64
release bulds.

- Removed more bitrot (the "while" loops).
- Factored out common parts of dofs_vn() and dofs_md().

GC some old cruft.

*BANG* *BANG* *BANG* *BANG* *BANG* *BANG* *CLICK* *CLICK* *CLICK*
*BANG* *BANG* *BANG* *BANG* *BANG* *BANG* *CLICK* *CLICK* *CLICK*

Death to the stripped down BOOTMFS kernel for boot floppies and all the
cruft that goes along with it.

Add a script to split a single file up into chunks using split along with
a list file suitable for use with libstand's splitfs filesystem. The first
chunk of the file is 16k and has an extension of '.boot' and is meant to be
placed on the boot floppy. This is required because the current
implementations of gzipfs and bzipfs in libstand want to read in the header
of the file each time it is opened.

We also want the *_p.a symlinks to be part of the proflibs distribution.

Opera is i386-only.

'+' can also appear in a package file name.
Reported by: jhb

'^' could also appear in a package file name.

Creates an INDEX file suitable for an ISO distribution image containing only
the specified packages.

Slim down the package list some more. The KDE and Gnome metaports might
need to be tweaked a bit, but this gives the disc1 ISO a fighting chance.

Depend on kde-lite and gnome2-lite instead of kde3 and gnome2. This greatly
reduces the amount of space occupied by packages on release disc 1.

Approved by: re (scottl)

Also export the ARCH variable so that cross-generation of cdrom package
lists works as expected.

Approved by: re

vim-lite can hardly be considered 'lite'. Remove it.

Export PARALLEL_PACAKGE_BUILD to the environment as well to catch more
packages that should/should not be included on the first CD. This is needed
for the recent KDE space-saving change.

Approved by: re (bmah)

Put x11-wm/sawfish2 and irc/xchat on CD 1 instead of sawfish and xchat.
Sawfish is gone, and xchat2 is more widely used these days since it is the
current stable release.

Approved by: re (murray)

Fix this script to produce working bootable floppies on 4.x.

Fix typo. It's 'bsdiff' not 'bsddiff'.

Add misc/bsdiff and security/freebsd-update to the list of desired
packages for disc #1. These two packages take a combined total of
37kb of space so I think there should be room.

Add support for automatically computing the required file system
size and average inode size.

Reviewed by: jhb

Sort entries added in r1.43.

Postfix, pcre, and Exim should be on the first CD in order for the recent
sysinstall(8) commit to function properly.

Discussed with: bmah (while the sysinstall(8) patch was sent to 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)

Revision 1.49 broke snapshot building on older systems.

Approved by: re (scottl)

The disc1 package set has overfilled the disc. Axe linux-netscape-navigator-4.8
to free up space. linux-netscape-communicator-4.8 remains and is a superset of
the former for those who are stuck are the 1990's =-)

Use UFS1 for the floppies instead of UFS2

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

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

Reviewed by: phk

Fixed dofs_vn(): previous revision ran ``rm -f /dev/*vnn*'' too early.

Unmount the file system and detach an underlying memory disk even
if the script fails somewhere in the middle.

Prodded by: phk

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.

Add another index checking script to ensure the sanctity of the
package set. More robust than others already in the tree, but a bit
crufty as this was mostly written in the Walnut Creek CDROM days.

Sponsored by: FreeBSD Mall, Inc.

Update maintainer. Thanks to Jordan for getting this started, but he
hasn't been the maintainer for at least a year.

Stay consistent with dofs_md().

This took longer to test than expected:

NODEVFS cleanup: don't bother with MAKEDEV.

Look for /boot/boot first, and arrange disklabel arguments accordingly.

- Add mozilla to the package list since it would be nice to have a browser
that a) was from this century, b) is not Opera, and c) doesn't require
KDE.
- Don't include the compat22 libraries unless the PKG_ARCH is i386. Same
goes for compat3x and compat4x for i386 and alpha.
- Define PKG_ARCH and make it overridable in the environment.

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Move lang/perl5 from the "want to have on disc1" to the "sysinstall
requires on disc1" part of the package split list, to track the
Perl support in sysinstall. Essentially a cosmetic change.

Approved by: re

Add a script to create a manifest of the drivers.flp disk. This
generates a file which will be installed as DRIVERS.TXT in the
floppies directory so that users know which device drivers are
included on drivers.flp, and whether or not they need to worry about
it.

Reviewed by: ru
Approved by: re

We use .tbz packages in -CURRENT now.

Approved by: re

Make the following changes to the semi-automated package split:

1. On disc1, print/acroread4 for alpha and print/acroread5 for i386
replace print/acroread, which was not compatible with the linux_base
that we ship by default. Remove print/acroread4 from disc3 as
redundant.

2. www/linux-netscape47-* were removed due to security holes;
substitute www/netscape48-* on disc1.

3. Add www/opera to disc1.

Approved by: re (murray)

Make GNOME 2 the default version of GNOME that goes on the disc1 package
set.

Requested by: marcus
Approved by: re (bmah)

Move lang/gnat from disc1 to disc3. (Possibly a moot point, since it
doesn't build on CURRENT at the moment.)

Approved by: re (murray)

Explicitly add lang/perl5 to the disc1 packages. Practically speaking,
this is unnecessary, because some other port is likely to depend on it
anyways. But just to be safe...

Make sure that we don't pick up installed packages on the host when
we print dependencies (required by rev. 1.424 of ports/Mk/bsd.port.mk).

Reviewed (and partially submitted) by: kris

Add Ian Freislich's excellent, BSD-licensed POP3 server
(ports/mail/popd) to the list of packages that should appear on CDROM1.

Approved by: re

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.

We now use XFree86-4 packages rather than a special XFree86-3
distribution, so this script is no longer needed.

Accomodate change in the output of "make package-depends" that came
with ports/Mk/bsd.ports.mk rev. 1.424. (It now prints the origin
after the package name.)

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

Use the new docproj-jadetex port for disc#3. Previously, docproj was
not included in its entirety because JADETEX was not defined.

Check the run dependencies, not the build dependencies

Spotted by: steve
Pointy hat: brian

A script to generate all of the packages/*/* symlinks described in the INDEX

A script to validate that the packages and dependencies listed in
the INDEX file exist.

MFS r1.1.2.18 - Include vim6 rather than vim5 on disc #1.

Perl left src/.

Make these work with one-true-awk.

Spotted by: nyan

Convert Perl scripts to awk(1).

MFS: Switch to KDE 3 for the CDROMs.

Add support for kernel options to be removed from the BOOTMFS kernel
and loaded as modules, not just kernel devices.

boot2 does not exist on some platforms.

bin-install.sh has been repo-copied to base-install.sh.

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>

Add script to install the compat4x distribution, just like other
compat*-install.sh scripts.

PR: 37485
MFC after: 5 days

Removed some cruft.

Build the catpages distribution in a more natural way.

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

Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.

Add net/cvsup-without-gui and print/acroread4 to the disc3 package list.

Sort.

Add www/links to the list of required packages. It is used by
sysinstall to read the HTML documentation.

Move graphics/gimp1 and lang/gnat from disc #3 to disc #1, we have
extra space.

Add a list of packages that should not be included on any CDROM, so
that we don't forget that sysinstall really does not like the
net/cvsupit package.

PR: ports/31399
MFC after: 1 week

Add graphics/gimp1 and lang/gnat to the list of must-have packages for
disc #3.

Requested by: "Dennis Lowery" <dennisl@rio.com>

Add textproc/docproj and editors/xemacs21 to the list of packages for
disc #3.

MFC after: 1 week

* Add print/teTeX to the list of important packages for disc #3. This
very large package is exactly the kind of thing that users buy the
CDs for, so leaving it off of a 4 CD set is very bad.

* Properly quote the last security/sudo entry.

* Add a comment in the CDROM #2 section explaining that packages don't
typically go on this disc.

Add security/sudo to the list of packages for disc #1. sudo is small
(< 100k), has no dependencies, and is very popular.

Add emacs21 instead of emacs20 to the first CDROM.

Reviewed by: nobutaka (editors/emacs21 maintainer)

Add net/samba to the list of important packages for Disc #1.

Discussed with: steve, portmgr, re

Don't print out 0xaa55 at the end of a vnconfig disk and use the
"canonical" disk name when calling disklabel so that disklabel auto works.

Backout previious change - package built on bento is called sawfish-gnome,
but the port is still x11-wm/sawfish, not x11-wm/sawfish-gnome.

Shame on: sobomax

Safwish package built on bento is called `sawfish-gnome', so adjust sysinstall
and print-cdrom-packages.sh accordingly.

Revealed by: re
MFC after: 1 day

Add exim to the list of packages that's guaranteed to be on the first
CDROM.

Approved by: steve

- Remove the -T from the 4.x newfs as well.
- Don't write out 0xaa55 to the end of the filesystem as md(4) doesn't
generate that warning and it breaks 'disklabel mdX auto'.
- Use the 'canonical' disk name mdX instead of /dev/mdX to disklabel so
we can use disklabel auto for mfsroot filesizes that aren't a standard
size in /etc/disktab.

The -T argument to newfs is only needed if teh disk isn't already labeled.
Since we run disklabel before newfs, this doesn't apply in this case.

Use the md device not olny a version of the system is 5 but 5 and over.

Requested by: matusita
MFC after: 1 day

Use the vn driver on a stable system.

Replace print/ghostscript6-nox11 with print/ghostscript-gnu-nox11.

All of this is now committed to the XFree86 port.

Add sysutils/portupgrade to CD-ROM #1. (+1.5MB)

- Add some diagnostic echos of status of each stage.

Because www/netscape47-{communicator,navigator} are forbidden, replace
them with www/linux-netscape47-{communicator,navigator}.

archivers/bzip2 is no longer a VERY common build dependency.

(See the latest INDEX)

Axe all the plists and supporting scripts to manage them and use them to
roll dists.

Overhaul this script a bit:
- build_x.sh now does all the steps to build an X dist rather than being
a child script of package_x_dists.sh
- Update the usage information to list the ports you need to install
before running this script as well as needing to set CVSROOT.
- Make sure CVSROOT is set. If not, exit with an error.
- We now take two parameters: a work directory and an output directory.
The work directory is used as scratch space. All of the bindist will
end up in the output directory.
- Only apply XF86.patch to the checked out XFree86 port if it exists.
- Use XFree86's build-bindist tool to package up the dists using their
distfiles rather than using our own packing lists that have to be
manually updated each time the port changes.

Example usage:
env CVSROOT=/home/ncvs ./build_x.sh /usr/xtmp /usr/x11dists

The current XFree86 port needs some help in the BUILD_XDIST case. Commit
this patch here until I can get the port fixed.

Misc. changes:

* Rename cvsup-bin to cvsup (cvsup-bin does not exist anymore).
* Add the net/rsync port to the CDROM packages.
* Add the misc/compat* ports.

Approved by: jkh

This has been repo copied to src/release/${MACHINE_ARCH}/dokern.sh

Port "x11-fonts/XFree86-4-fontLatin2" has been removed from the ports
collection.

MFC after: 3 days

MFS: Add vim-lite and netscape47-navigator.

Sort the package lists to make tracking changes easier. No functional changes.

MFS: Add sawfish and windowmaker (1.1.2.2 -> 1.1.2.3)

They are required by sysinstall's XFree86 desktop configuration menu.

Fix typo in comment: dependancies -> dependencies

Some ports have been renamed after this script has been created.

A couple of renames are needed (disc 1):

print/xpdf -> graphics/xpdf
mail/pine -> mail/pine4

- Add some environment variables that need to be present when using packages
from the build cluster. These are required to get the dependencies the
same as the parallel builds.
- Add an optional second argument that allows you to specific an alternate
ports directory.
- Remove the temporary file after we are done with it.
- Remove ksh93 because it won't make it on the discs until the license issues
are resolved.

Approved by: jkh

Turn on kernel debugging support (DDB, INVARIANTS, INVARIANT_SUPPORT, WITNESS)
by default while SMPng is still being developed.

Submitted by: jhb

Apply rev 1.48 (only dike out the `ncr' driver, not every line with the
[sub]string "ncr" in it) to the Alpha also.

*sigh*... when trying to dike out the `ncr' driver, I was getting the `sym'
driver too because it had "ncr" in its comment.

Submitted by: joerg

NOBLOCKRANDOM doesn't exist anymore as a kernel option.

Add FreeBSD IDs to some files and make the others consistent in style.

Reorder the Alpha cut-out list to match the order in the GENERIC kernel.

Add apsfilter to "important package" set.

Submitted by: andreas

- XF86.patch is no longer needed as it is all checked into the XFree86
port conditional on the BUILD_XDIST variable.
- Define BUILD_XDIST=yes when compiling XFree86.

Until this is *truly* unused (sorry Steve) and replaced by something
better, put it back.

Everyone that has commented seems to agree `-m 0' will cause no problems.

Remove tunefs'ing that was OBE by rev 1.30.

Submitted by: bde

newfs with `-m 1'

This is needed even with `-o space' as the kernel decides to be "helpful"
and not really do space optimization. Looking at src/sys/ufs/ffs/ffs_alloc.c
we see why: if (fs->fs_minfree <= 5 ||
fs->fs_cstotal.cs_nffree >
(off_t)fs->fs_dsize * fs->fs_minfree / (2 * 100))
break;
log(LOG_NOTICE, "%s: optimization changed from SPACE to TIME\n"

I have picked `1' vs. `0' just incase some code somewhere has the assumption
the %free can never be `0'.

Helped with understanding why -m 1 made a different: imp

SMALL floppy image require miibus device.

Remove the parts of the patch that was committed to the XFree86 port.

Default the plist dir as we know where it is relative to us.

Minor comment & doc tweak.

Use mdconfig/md instead of vn.

The Alpha MFSROOT image runth over.

Dike out support for DEC3000/300* Pelic* and the DEC3000/[4-9]00
Flamingo/Sandpiper families, SLIP, lance Ethernet (especially since `le'
based Alphas are diked out now too), POSIX P1003_1B real-time extentions,
and last but not least "NOBLOCKRANDOM" since the random device is removed.

This lets us fit [barely!]:
Filesystem 1K-blocks Used Avail Capacity iused ifree %iused Mounted
/dev/vnn0c 1407 1386 21 99% 6 24 20% /mnt
*** Filesystem is 1440 K, 21 left
*** 80000 bytes/inode, 24 left
Created /R/stage/floppies/kern.flp

Using `r'aw device name is out of vogue now.

Sync with sys/i386/conf/GENERIC rev 1.291.
Remove `pmtimer' from the MFSROOT kernel as `apm' is already removed.
`pmtimer' also removed from the Alpha kernel incase it ever winds up there.
(could it ever?)

Don't put pcm device on boot floppies (yet - it would be kinda nice to be
able to play a little Joe Satriani during installs :-)

Create the various required directories if they don't exist.

Update this patch to apply to the latest XFree86 3.x port.

Correct some old comments.

Add in a few extra documents built by the latest XFree86 3.x port.

MFS: comment character and readability fixes.

Moved driver modules for some PCI NICs and PCCARD-only NICs to mfsroot.flp.
http://people.freebsd.org/~hosokawa/driver-floppy/ for details.

Reviewed by: current@FreeBSD.org

Do not include uscanner in the generated kernel config. Also, remove
ugen, uhid, ulpt from small as well.

Suggested by: obrien

We were trying to dike out `apm0', but of course devices do not have
unit numbers in GENERIC any more. So `apm' was acutally being compiled
in.

Dike out more for the i386 release build: NCR SCSI card; anchient WDC
SCSI card (should it ever find its way into GENERIC); LPT (we don't need
to print during install time); the parallel 'geek' port; generic USB
driver (thus some attached USB devices will not be detected and thus the
user may wonder what is going on, we couldn't do anything with the device
if only ugen attached to it anyway and we are getting very, very low on
available space; USB "Human Interface Devices" as we don't do anything
with them during installation; and USB printers (same argument as LPT).

Remove random from boot floppy on advice of Mark Murray

I don't think we'll ever take any input (or send output) to a
Diamond Rio 500 MP3 player during an installation.

Move maxusers around to reduce the diff from RELENG_4 version.

MFS: do not include MSDSOFS support for the Alpha

The 'pci' device is not needed for SMALL floppy, but the 'pcic' device is
needed.

Added the pcn device into the list for SMALL kernel.

- Make both 1.2MB and 1.44MB floppy images for PC-98.
- Rename BIGBOOT to FDSIZE for the floppy image size.

* Add back DEVRANDOM for all arch's until we deal better with the
installation of random sensative packages.
* Remove the `ncr' driver in the Alpha case -- the `sym' driver works with
every known Alpha.

Since the XFree86 port builds and installs some extras not found in the
3.3.6 base distribution, some of the packing lists needed hacking so that
they would pack up everything in the right place. As a result, go ahead and
just add a directory for the packing lists. These are the i386 packing lists.

This script uses the other scripts in this directory to build XFree86
3.3.6 in a work directory and package it up into a set of tarballs that
can be used in a release.

This script takes the packing lists we generated earlier and generates the
corresponding tarball from it. It uses the packing list name to determine
the tarball name. If the tarball name ends in 'gz', it will be gzipped, if
it ends in 'bz', it will be bzip2'd.

This script uses the XFree86 and XFree86-contrib ports to build and install
XFree86 3.3.6 into a scratch directory. The patch file patches the XFree86
port to not ask any questions and to actually be able to install some things
like the i810 server link kit bits. If you want XF86Setup to build, you
should have tk80 (not tk82) installed. If you want to XF86Setup_jp to build
you need to have ja-tk80 installed.

This script uses an existing set of XFree86 distribution tarballs to
generate a packing list for each tarball. We can later use these
packing lists to roll our own tarballs.

Add FreeBSD Id to make this easier to track.

Squeeze the BOOTMFS kernel image some more. The Alpha kernel was simply
over flowing its britches. So remove all ppbus bits except those for PLIP
(untested), and all USB bits as SRM does not know what USB is. Also remove
/dev/random as I don't think we need it just for whacking bits onto a disk.

Approved by: JKH

IPv6 support.
IPv6 configuration is only done by rtsol. Does someone really
need manual configuration? :-)
You can specify IPv6 DNS server as well.
We have only one server ftp7.jp.freebsd.org that speaks IPv6
in this time. ftp7.jp speaks IPv4 as well and also listed as
Japan #7.

Approved by: jkh

We don't do blockdevices any more.

XXX: should use /dev/MAKEDEV

Add options NETGRAPH_ETHER

Make sure SOFTUPDATES doesn't wind up on boot floppy and bloat it
up.

Hopefully wave the unbreak-release magic wand at dokern.sh. Use GENERIC's
hints strings with BOOTMFS.

Add 'tools' to the list of tarballs to be extracted when 'all' is
specified as the distribution.

PR: 18927
Submitted by: Stephen J. Roznowski <sjr@home.net>

Minor nit: this tar(1) replacement still used /dev/rst0 as its default
device.

Adapt to the crypto distribution.

The best way to remove IPv6 things is to remove lines with the pattern
'IPv6', and it's not necessary to do it explicitly per entry.

Approved by: jkh

Elide INET6 related options for boot floppies.

s/pass0/pass/ so the passthrough device is removed from BOOTMFS.

kernel space savings allow reactivation of NFS installs.

Sacrifice, for now, NFS and NETGRAPH on the alpha boot floppy
so that we can get it back onto 1.44MB boot media again. This
does not affect the i386 class build.

don't mknod stuff without making sure it's not there first.

Make it possible to make release on archaic kernels.

Add options NETGRAPH, NETGRAPH_PPPOE and NETGRAPH_SOCKET
to the release kernel.

Correct the Crypto dist's name in a string.
Get the KerberosIV dist from the correct files.

Don't need to add bpf anymore.

Preserve permissions through tar pipelines.

Bump maxusers in installation kernel down to something more low-memory
friendly.

$Id$ -> $FreeBSD$

Link libcrypt_p.a to the DES profiled library, if this library is present.

PR: misc/7759
Submitted by: Carl Mascott <cmascott@world.std.com>
Reviewed by: jkh

Rename bpfilter to bpf.

Various edits to shrink fixit and enable dhcp-client

MFS.

Add script to install the compat3x distribution.

MF3: SYSVMSG addition, fluff with release notes.

Don't strip out stuff from boot.flp now that it's twice the size.

Nuke pnp0 from boot.flp

1. Adjust fs sizes to get floppies back under control.

2. Viciously slash all CD support out of boot.flp. It's basically just
a net boot floppy now.

NO_LKM is deprecated

swap support is actually pretty important; put it back
CVS: ----------------------------------------------------------------------

More floppy size adjustments - I thought I'd already committed these, whoops!

Replace /mnt with ${MNT}

PR: misc/7965
Submitted by: Junji SAKAI sakai@jp.freebsd.org

Remove some remaining references to LKM's. Snaps were trying to unpack
slkm* etc, among other things.

Hammer on the boot floppy generation bits some more. This is looking
a little better.

Update this to deal with new boot block placement.

Reported by: "John W. DeBoskey" <jwd@unx.sas.com>

Shuffle the exclusion list for boot.flp in an effort to get sizes
down again.

Put mfsroot.gz on yet another filesystem so that the boot blocks
can really read it. Hmm. I have no idea *how* this worked in our
earlier tests on the x86. :)

Null commit to commemorate the momentous occasion of the repository
copying of these files from the parent directory. Let us all now
observe a brief moment of silence. OK, that's long enough.

Jordan will adjust the Makefiles appropriately and then "cvs rm" the
originals.

Simplify call to dokern.sh - now the no MFS case is the default.

Boy, two typos in one day. Time to go back to bed.

Elimintate gratuitous backslash

Add MATH_EMULATE back to kern.flp. Now at least the FPU-less have *some*
way to install 3.0.x.

We've overflowed boot.flp again. Go to a boot.flp which contains
a bit less legacy hardware support, that all still remaining a supported
option with kern.flp (and a two-floppy install). This will be documented
in the release notes, I promise.

adjust to match current times.

Updates for Alpha.

Whoops, correct brain-o.

Add a tweak for the alpha.

Fix proflibs again.

Allow the use of ${DESTDIR} in the enviroment to optionally get
these various collections to install someplace else.

BINFORMAT -> OBJFORMAT ready for E-day.

Add BINFORMAT awareness.

Add the whatis database to catpages too

Make the vn device that is being used to build the floppies configurable.
You can now do something like "make release VNDEVICE=vn1". This makes it
possible to do something else with vn0, for instance building another
release.

Add script for properly breaking out the doc dist.

Support crypto and kerberos src dists.

iso codes need to be in bin distribution for tzsetup

Split section 6 catpages/manpages out into games dist.

Merge from 2.2

Fix bogus patch (my fault)

Properly make directory before moving things into it.
Submitted by: pst

Yeesh! Some of this stuff I yanked out of the makefiles without
reviewing closely enough (and, as a result, proflibs and dict suffered).
Fix.

Shut up catman output.

New build scripts for these distributions.

Add support for ports collection distribution.

Revert $FreeBSD$ to $Id$

1. Sync ABOUT.TXT changes.
2. Go back to using a filesystem on the boot floppy; the rawboot boot blocks
were just too non-functional for other things.

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Add an install file to go with this new distribution.

Bring these up-to-date with Peter's compat distribution changes.

Another fixit improvement: add a lame script that pretends to be
tar(1), but actually uses cpio(1). Many people are getting confused
about the lack of a tar on the fixit floppy, and simply don't know
that cpio can basically handle tar format fine (or they simply don't
know how to invoke cpio).

Simplify the disklabel trickery, and thus avoid the dreaded
``Operation not supported by device''.

Requested by: jkh

Try to impreve DD mode.
Try to make 4Mb floppies work again.

Purely cosmetic cleanup.

Ahem. It might be nice if I included /usr/src/contrib in with the other
src dists. This alone is a good reason to re-roll the SNAP before putting
it on CD.

Installation cleanup, round II.

Some release changes I've had to make in dealing with the floppy space
crisis.

Automatically add install.sh scripts to dists.

Various fixes, take power.uu out as it was causing overflows. We'll
need to fetch it dynamically rather than keep it in the source tree
(subject of a follow-up commit).

Add install script for doc, make bin install more intelligent.

Make the reduction algorithm to tune the file system size less
aggressive, in order to avoid /mnt: file system full problems.

Introduce a deadlock counter.

Turn off echoing again, it's cluttering the screen/log.

Gross hack to avoid the `vn0: invalid primary partition table: no magic'
warning.

Seems that doFS.sh is now doing the job...

Remove phk's errr... interesting idea of slicing a floppy into 10
cylinder groups. :)

Correct typos. "ubin usbin" instead of "subin susbin"

I belive this works now.

Shrink BOOTMFS kernel further. Make doFS.sh more intelligent.
boot4.flp should work fine as far as I can tell.

Don't make the fs-image in /dev :-)

Moved doFS into shell-script so we can be more smart about it.
make two boot floppies, one without help files for 4MB systems.
Mine's loading one now. :-) -O2 may be needed.

Check in the shell scripts I used for the 2.1-RELEASE CDROM. These
are provided simply as easy short-cuts for users who are prowling through
the dists structure and decide to install something directly from there.

There still needs to be some glue stuck into release/Makefile to copy
these into the appropriate homes following a full `make release', but I'll
wait until phk is done in there.

recording cvs-1.6 file death

Merge RELENG_2_0_5 into HEAD

Jordan forgot this in his last sync commit. It's a wee shell script
to help generate the .inf info files I use during the extract process.

DES -> des. Sigh!

secure -> DES.

Add a "set -e" to all of these, to catch failures.

The tmpdir cleaning routine _still_ wasn't right! :-(
I think this truly fixes it.

tell people what we do at the end, since it can take a little while.
use "set -e" when extracting bindist
make src dists extract.

Do another pass over the delete code. This is better. Now we don't
try to expand a wildcard to delete the entire contents.

Try and see if I can make the remove function work..

Remove preservation of myname and defaultrouter files - they're deprecated
anyway.

Add lnc0 ethernet driver.

Added zp0 and eg0 to interface menu. Dropped all the "at 0xfoo" comments.

Various changes:
tip removed from cpio.flp (!) crunch chokes on it after the latest changes.
source for secure & eBones moved into securedist.

Save /etc/sysconfig from destruction.
Don't put termcap.db and vgrinddefs.db in the tarballs when they are so
easy to generate and take up so much space...

They mystery of the recursive /sys/sys/ solved.

mkdir /usr/src if it doesn't exist.

Add sysconfig to list of cpio floppy targets.

Fix a bogon.

A whole slew of changes relating to the generation of src-dists.

Tolerate both ways of doing the src-dists.

Set hostname properly in /etc/sysconfig

set SHELL for ftp.

Name juggling, make things a little clearer.

Add a missing ${DIST}/

Remove gratuitous remove and make it an ln -fs

Add "ix0" Intel EtherExpress.

Add entry for Sound Blaster/Matsushita CDROM

Give user a change to read startx messages.
Suggested by: David Muir Sharnoff <muir@idiom.com>

Fix embarassing typo pointed out by Dave Sharnoff - 16bit does
NOT = 16k colors! :-}
Submitted by: David Muir Sharnoff <muir@idiom.com>

Fix up the comments about NFS options - the ones listed were wrong
Submitted by: wpaul

Some small cosmetic changes I'd been meaning to make.

Link to /sys in extract.

Fix a small punctuation typo I just noticed.

On second thought, only do extract if select returns success.

Clean up some of the english, make things more explanatory.

Eliminate gratuitous select step.

Prepare for 950210-SNAP

Extract the sources into the right place! Can't believe I didn't notice
this before.

Give the user a chance to specify all the network setup parameters again

Whoops, actually DO the last config!

Get ready for the XFree86 3.1.1 distribution (next snapshot),
compat1x -> compat1xdist

Put the release number in the first banner - makes it easier to quickly
tell if I've muffed it.

Fix some last boners in the setup script.

Why not give user a chance to start it, too?

Make this a bit more aggressive.. :-)

Here's the _real_ XFree86 3.1.1 installation script. I'm ready.. :-)

Clean these up a bunch more - gee I'm glad I do these snapshots, they uncover
*so many problems*.. Too bad the snaps themselves don't get made as a
consequence.. :-)

Bump the date forward Yet Another Day. David has some changes he wants to
see rolled in, so I guess we're down for Feb 2nd as the snap date!

This was misleading - you select OK to continue, not Cancel! ;-)

We no longer need a welcome telling us to take a floppy out - it's already
out.

Clean up the documentation in light of a few recent changes.

We don't need to go back to the first screen again - optimize this.

Bump the date on the snapshot. The previous one never happened.. :-)

Add sweden to list of install sites.

Try one theory about why the domain name isn't being default right now.

srcbin dist, not bin

Take out ?diskfree - it doesn't make any sense now..

I blew the date on this. Sigh..

Make some of the extract scripts more explicit.

Print message about ignoring stupid warnings in game dist
Don't ask user to press return after every dist.

Syntax errors corrected
Add support for Sony CDROM

Tweak some of the notes.

Update everyone's paths to point properly into /stand/scripts.

Bump the snap number

Make this not fall over screaming if a file isn't found (the user might
not have wanted it).

Adjust some of these extract scripts.

Adjust names of distributions.

Add some helpful text about send-pr.

Add very crude beginnings of the setup script.

Initial revision

Do the right thing with init for secrdist.

Initial revision