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