- 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

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

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

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

ISO 9660 specification allows only "d-characters" and "a-characters" in the
Volume Descriptor (section 7.4). In short, upper-case alphanumeric + some
symbols only. While the makefs utility automatically converts the characters,
$LABEL should be consistent in the scripts.

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

Garbage collect some unused variables and stray debug code.

Submitted by: marius

Repair release CD generation on PC98 and sun4v after release building
changes, and backport the new logic (ISO images are TARGET dependant, not
TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO
image scripts, change several archs to use makefs (from base) instead of
mkisofs (from ports) which makes release CD generation both faster and
self-hosting.

Fix making a release. The old libdialog was renamed to libodialog.

Reorder to have -lcrypto after -larchive. Our linker doesn't seem to like
the current ordering :(

libarchive now needs libcrypto and liblzma.

Remove slattach from the install mfsroot since it doesn't exist anymore
to quiet a warning from crunchgen.

MFC after: 1 week

Remove libulog from the bootstrap again.

libulog now only provides functions that are used by various packages
from the ports tree, namely the libutempter ones. There is no reason to
link it into the crunch/fixit binaries anymore.

Don't forget to link the fixits against -lulog.

reboot(8) now depends on it.

Reported by: nyan

Add libjail to the boot_crunch binaries (for ifconfig).

PR: 136071
Submitted by: Scot Hetzel
Approved by: re (kensmith), bz (mentor)

- Add libbsdxml and libsbuf required by bsdlabel.
- Remove the mknod from pc98 fixit and also the ftp from pc98 small fixit
to avoid disk full.

Recent work on the gnu cpio seems to have introduced some bugs, it
complains about "Malformed numbers" while unpacking the dists and
what winds up on the disk isn't correct. Use this as an opportunity
to switch over to bsdcpio since at this point we don't even build
and install the gnu cpio by default. Note sysinstall needed to be
tweaked a bit (dropping tape block size setting) because it seems
bsdcpio doesn't do anything with block sizes, at least as far as
reading from archives goes. That wasn't really a problem since
installations from tape have been broken for a while and the rest
of sysinstall's tape support code will be removed shortly.

Replace the ee with the ed to resolve disk overflow.

Add the ed and remove the vi.
This fixes a disk-full error.

libbsdxml is now required by ifconfig(8).

Submitted by: Florian Smeets

In 'fixit mode' running "fsck /dev/ad0s1a" typically complains that it
can't find fsck_4.2bsd because there was no fstab file saying what
filesystem type it is looking at so it got the filesystem type from
the disk's label. When that fails admins who haven't been in this
situation before are most likely to try "fsck -t ufs /dev/ad0s1a" because
ufs is the type used in fstab files on working systems but that also fails
complaining it can't find fsck_ufs.

This just sets it up so /stand in the MFS image (/sbin is a symlink
to /stand) includes hard links pointing fsck_4.2bsd and fsck_ufs to
fsck_ffs which is what is present in /sbin on installed systems.

Prodded by: obrien
MFC after: 1 day

Remove the restore and chroot command to avoid disk-full error.

Remove the telnet command because of filesystem full.

Disable an SMP detection on pc98.

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.

Switch from OLDCARD to NEWCARD on pc98.

Keep each prog on its own line so that diffs between various
*_crunch.conf files are easier to read.

Take away unused libraries.

Unbreak fixit crunch: since Feb/17/2004, mount(8) requires libufs.
See also src/sbin/mount/Makefile rev 1.14.

Noticed by: snapshots.jp.FreeBSD.org

Put slattach(8) onto the MFS root file system now that we always
use the GENERIC kernel for installs which has the sl(4) support.

*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.

- Support for multibyte charsets in LIBICONV.
- CD9660_ICONV, NTFS_ICONV and MSDOSFS_ICONV kernel options
(with corresponding modules).
- kiconv(3) for loadable charset conversion tables support.

Submitted by: Ryuichiro Imura <imura@ryu16.org>

MFi386: sort.

OK'ed by: nyan

Pacify src/tools/tools/release/chk_dokern.sh_and_drivers.conf.

Merged from RELENG_5_1: Don't use MUTEX_NOINLINE.

Keep entries sorted by floppy, type, and name.

Enable the MUTEX_NOINLINE option for the BOOTMFS kernel for ia32, pc98, and
alpha. This shaves 36-50k off of the compressed kernel size.

Submitted by: jhb

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)

Removed mount_devfs from progs since there is no "mount_devfs"
source directory (it's spelled mount_std nowadays), so it was
a no-op anyway, and DEVFS is now the default.

axe is commented out in GENERIC on pc98, so this wasn't needed.

Pointed out by: Takahashi Yoshihiro <nyan@jp.FreeBSD.org>

Move Bill Paul's new axe driver module to floppy disk 3 on i386 and
alpha, disk 2 on pc98, and keep it in the boot kernel for sparc64.

NO_COMPAT_FREEBSD4 is no more.

Removed redundant lines.

Noticed by: obrien

Go for the auto-tuned `maxusers'. This at least fixes
the ``panic: timeout table full'' on Alphas.

Tested by: wilko

wlan module depends on rc4 module, so provide one.

Reviewed by: imp

MFi386: Don't remove UFS_ACL support.

Move the nfsclient support into mfsroot floppy.

Remove the atapifd and atapist support from boot floppies.

Unbreak i386 snapshots by moving the 802.11 support (device wlan)
out from BOOTMFS to the drivers floppy.

tunefs now requires -lufs.

Add ATA_NOPCI option for small kern.flp floppy.

Approved by: re (murray)

Don't move NFSCLIENT.

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

Don't move the NFSCLIENT support into mfsroot-small.flp.

Disable COMPAT_FREEBSD4.

Update comment to note that the third floppy (for modules) has been
implemented. Add a note reminding developers to update drivers.conf.5
if they add new functionality here.

Remove the slattach command from the mfsroot floppies.

- Remove the UFS_ACL option from the boot floppies.
- Remove duplicate entries.

Add mount_devfs so we can remove MAKEDEV from the fixit floppy. These
two changes make stuff fit in a floppy image again.

Note: tested only for i386, but (blindly) applied to all machines

Remove usbd and usbdevs.

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.

Move the ed, fe, CD9660, MSDOSFS and NFSCLIENT into mfsroot floppy instead
of the pcn, sf, ste, tl and tx.

- Remove the splash, ppc, ppbus, plip and em devices from small boot floppy.
- Remove the splash, ch and sa devices from normal boot floppy.
- The agp device does not exist.

The boot floppy requires the lnc driver.

Back out last commit where I moved pcn(4) off of the modules floppy back
into the install kernel. Unfortunately pcn(4) also needs mii(4) so that
would also have to added to install kernel, which will bloat it up so that it
doesn't fit on the floppy any more. Turns out we grew a lnc(4) module since
I last looked. So handle it as a kld loadable module during install rather
than have it statically compiled into the kernel.

Statically compile pcn(4) into the install kernel vs. using as module.
lnc(4) will attach to AMD PCnet/FAST NICs if pcn(4) does not attach.
I.e. pcn(4) gets first chance. There is a problem however in that pcn(4)
was moved out of the install kernel so that the module would be used.
This however causes bad installs if one has an AMD PCnet/FAST NIC.

Remove the AH[CD]_REG_PRETTY_PRINT options from the boot floppies.

Discussed with: gibbs

Pc98 does not have the agp device.

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

Add device agp to GENERIC, filter it out of floppy builds

Approved by: des (mentor)

Removed the ch, sa and ses devices from 'SMALL' boot floppy image.

Update a comment to accurately describe the usage of the fourth field
of this file.

Don't move more drivers to mfsroot floppy.
A mfsroot floppy for pc98 is only 1.2MB.

Don't move the an and wi drivers to a mfsroot floppy.

- Sort some entries.
- Don't remove MATH_EMULATE and MSDOS from a 'SMALL' floppy.
- Use the pattern '<tab><device name><tab>' instead of '<device name>' to
avoid an unexpected matching.

MFi386: revision 1.52: add camcontrol

Enable UFS_DIRHASH in the GENERIC kernel.

Suggested by: silby
Reviewed by: dillon
MFC after: 5 days

Forget to remove fsck from src/release/{alpha,pc98}/boot_crunch.conf,
which should be done with src/release/i386/boot_crunch.conf rev 1.51
and src/usr.sbin/sysinstall/install.c rev 1.311.

Spotted by: nyan (via ReichaNet)

Use a separate drivers.conf between i386 and pc98.

Add fsck tool for UFS to /stand tools (again).

Actually src/release/i386/boot_crunch.conf rev 1.45 does this change,
but unfortunately there is no src/sbin/fsck_4.2bsd directory, but
src/sbin/fsck_ffs.

This commit replaces 'fsck_4.2bsd' to 'fsck_ffs', and add a link to
'fsck_4.2bsd' and 'fsck_ufs'. Note that 4-stable's fsck(8) have an
ability of fsck_ffs also, there is no need to MFC at least now.

Tested only for: i386 (but I believe this doesn't break for other archs)

NFS_NOSERVER doesn't do anything anymore and is about to get axed so don't
use it. Instead, remove NFSSERVER. This was already done on i386, but
the alpha still needed the fix.

The new libedit from a while back depends on ncurses, so put -ledit before
-lncurses so the fixit crunch binary links.

Tested on: alpha

Remove /usr/src/sbin/pc98 from srcdirs entry. It is not exist.
Add special entry for the fdisk command.

Restore MSDOSFS support to the install kernel.
Remove the `txp' `sf' `ste' network drivers instead.

Approved by: jkh

Try eliminating some more things from the -current installation
kernel in an attempt to get release builds working again.

Added the txp driver into the list for SMALL kernel.

Correct typo.

I think this is OK for PC98, someone please check.

As was done to i386/boot_crunch.conf:
+ Build with `lint' defined to cut out some of the `rcsid's (binaries' code
only, the libs will still have the `rcsid's in them).
+ mount_mfs is OBE.
+ Do not need libipx as I have conditionally diked that functional out of
ifconfig(8).

Unconditionalize these now that they live in ARCH-specific directories.

mount_msdos(8) -> mount_msdosfs(8).

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.

Cleanup: sort by directory/program, remove unused libraries.

Remove grep from the fixit floppy. This should free enough space to get
the snaps going again.

Moved -DRELEASE_CRUNCH into crunchgen(1) config files.
Record libtelnet.a death.

Moved -DRELEASE_CRUNCH into crunchgen(1) config files.

Add tunefs to the mfsroot floppy

SMALL floppy image require miibus device.

Add fsck_4.2bsd to boot crunch target. This returns the ability to
actually fsck (and upgrade) a box from boot media again.

Now that sysinstall lives in /usr/src/usr.sbin, we don't need to pull it
from /usr/src/release.

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

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

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.

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

- Removed machine dependent directory and command from
src/release/{boot,fixit}_crunch.conf.
- Added machine specific fixit_crunch.conf for PC/AT and PC-98 to
src/release/$MACHINE.
- Use config file in src/release/$MACHINE if exist. If it does not exist,
use in src/release.

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.

- Remove obsolete PC-card boot.flp hack. It was for making both PC-card
boot.flp and plain boot.flp.
- Clean up crunchgen related routine.

- Add PC-98 support.
TODO:
o Documentation
o Fix some messages for PC-98
o Decrease the size of fixit.flp to 1.2MB
o I18N (See: http://www.jp.FreeBSD.org/BootAsia/index.html)

No response from jkh

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.

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

Don't need to add bpf anymore.

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

Rename bpfilter to bpf.

Removed unused boot_crunch.conf

Add bits of PAO that are non-controversial.

Submitted by: Tatsumi HOSOKAWA

Various edits to shrink fixit and enable dhcp-client

Add dhclient to mfsroot floppy - changes to sysinstall to follow.

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!

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

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.

Try #2 with minigzip. Now that John Hay has made it behave more properly
like gzip, we should be able to use it here.

Remove support for floppy tape installs. I'm sorry, we're outta
space, and it's either this or the DOS installs. I think that the
DOS installs are somehow more important. :)

Revert my change to use minigzip. Apparently, this thing is too "mini"
to actually work in this application. Urk. This probably explains the
problems people have been having with installing -snap. My bad. Will
fix and upload a new beta snap to ftp.freebsd.org.
Noted by: jhay

Try using minigzip instead of gzip; can't hurt!

Remove the necessity of -ldes and -lalias etc from release/Makefile.
When building a release, RELEASE_CRUNCH is defined for a `make' of
the objects required by the crunch of each program. The object list
is still obtained in the same way, so you must make sure that all
objects are built (empty if necessary) by this make. ppp/Makefile
provides an example.

Reviewed by: jkh

Sigh - add libz to libs. Brian just keeps adding stuff to ppp. :)

There appears to be no way around linking with DES for the
moment - the compile-time options are useless since the object
files are being used from ppp to build the crunched image, and
the ppp objects include DES at this stage since they were last
built that way to make the secure distribution. Hmmmm!

Remove -ldes again; Brian's latest fix should deal with it.

Add (ick) -ldes to the boot floppy so that ppp can link again.
Not sure what this does to exportability but it's probably not
good.

Add -lalias for ppp now.

Revert $FreeBSD$ to $Id$

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.

Whoops, add -lftpio

Add -lcrypt for new ppp changes.

ppp now requires -lmd

Sheesh. I've added -lipx to the wrong crunch config file.

While i've been here, added the ``-s labels'' flag to vnconfig.

Update the -current sources from the 2.1 branch.

Approved (in spirit) by: jkh

Merge RELENG_2_0_5 into HEAD

Add mount_nfs so that we can do NFS installs.

Shrink the boot floppy by removing all extraneous stuff. Also increase
number of inodes.

Fix various bugs reported by Poul. Implement VTY switching.

1. Remove slattach from the root_crunch floppy and stick it on the boot
floppy (for slip install).
2. Try to work around a bodge in the ftp extraction loop where FtpEOF() was
being called more than once. Also fix a problem where the URL was getting
smashed in the environment by copying it to a temporary area before we
jump up and down on it.

Add ping to the boot floppy; it's too useful for problem diagnosis to
leave off.

Move ppp back to root floppy; we need it to load the cpio floppy,
potentially.

Rename boot.flp to root.flp

Whoops! Forgot libkvm.

Remove some extraneous junk from the boot floppy. Put ifconfig and route
on there.

1. Remove the scripts from the boot floppy - we don't need them anymore
and it saves us a fair bit of space.

2. Remove adduser and tzsetup as well - they're not needed.

3. Move ft from the boot floppy to the cpio floppy.

Add the ft program to the boot floppy.

Put find on the boot floppy. Don't ask.

Sheesh! What was I thinking. ppp should go on the cpio floppy, not
the boot floppy!

Add ppp to the boot floppy.

Add ls to the boot floppy - folks will be lost without it!

Use the proper libs for sh.

Put a shell on the boot floppy.

Remove ncftp from cpio - we don't need it any more.
Adjust boot floppy to (hopefully) include libdisk in the crunch.

Get sysinstall from /usr/src/release not /usr/src/sbin.

New and better "make release" rules.