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