Commit Graph

848 Commits

Author SHA1 Message Date
Marcel Moolenaar
9090f0c261 Now that make(1) passes variables that were given on the command line
to subordinate make(1) invocations through MAKEFLAGS, we cannot add
CFLAGS onto the make(1) command line. This will conflict with the
individual makefiles wanting to append to it, which is not respected
when CFLAGS is given on the command line. Hence build breakage.
So, put CFLAGS in the environment instead.
2004-08-06 17:07:40 +00:00
Ruslan Ermilov
7b07d01f0e Clean up after mechanical renumbering. 2004-08-06 10:04:06 +00:00
Colin Percival
5355286a0a Crypto is now part of the "base" distribution, and the old "release.3"
target no longer exists.  Renumber the old release.[4-9] targets to
release.[3-8].

Reminded by:	ru
2004-08-06 08:49:51 +00:00
Colin Percival
d37df47d31 Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

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

Glanced at by:	scottl
2004-07-15 04:52:57 +00:00
Brian Somers
ab5e865567 Die if make buildworld fails -- don't wait 'till installworld can't find
what it needs.
2004-06-10 19:33:26 +00:00
Hiroki Sato
9f2d40ab25 Add URLS_ABSOLUTE=YES into the doc.1 target. 2004-05-05 13:06:40 +00:00
Ken Smith
4f27387d5c Sorry for doing this backwards, but as with most release related stuff
we only pay attention to it during release time and at the moment it's
a -stable release in progress.

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

Adding a couple of variables to make tweaking the CD-ROM label and .iso
filenames easier.
2004-04-30 13:52:09 +00:00
John Baldwin
aaf3e5b065 - Only build a fixit floppy on i386 and pc98.
- Reenable boot floppies for Alpha.
2004-03-25 20:37:59 +00:00
John Baldwin
13ff581d3d - Use a stock loader with forth support on the boot floppies.
- Use the regular forth scripts including the stock device.hints file on
  the boot floppies.
- gzip all the various text files on the boot floppy that are larger than
  one sector to save on space.
- Generate a loader.conf to load the kernel, acpi.ko, and mfsroot making
  use of the 'module_before' variables to prompt for a floppy to be entered
  when required and use a stock loader.rc.  This enables the beastie menu
  on i386.
- PC98 has been changed to split the mfsroot for now so that the floppies
  fit.  When the PC98 bootstrap is updated to work with ELF files (which
  needs to happen anyway), then SPLIT_MFSROOT can be turned off for PC98.
2004-02-03 22:05:55 +00:00
John Baldwin
d943f83bf0 - Tweak order of arch fs options to stick all floppy options together and
all MFS root options together and in the same order on all archs.
- Drop support for using the no longer existing 2.88 floppy image for CD
  booting on i386 via the EMUL_BOOT variable.
- Use a stock loader on the boot floppy rather than one without forth.
- Force the gzip of the mfsroot in release.9 to succeed.  This is useful
  when doing lots of rereleases when testing floppy changes.
- If an acpi kernel module exists, stick it on the boot floppy and for
  now always load it after the kernel.
2004-01-29 19:01:58 +00:00
Ruslan Ermilov
e45b43aad2 Two nits from rev. 1.835:
- Fixed spelling of NO_FLOPPIES to unbreak snapshot building on
  architectures that don't support them (as installation source).

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

Reviewed by:	jhb
2004-01-29 16:21:00 +00:00
Yoshihiro Takahashi
6ab88893be The name of small boot floppy should be boot-small.flp to avoid conflicting
normal size floppy.

Reviewed by:	jhb
2004-01-29 15:14:59 +00:00
Ruslan Ermilov
5179f5c3b9 Revert revision 1.833 -- the reinstallkernel.debug target calls the
installkernel.debug target (in the kernel build directory) which is
only defined if the kernel was configured for debugging which it is
not the case for GENERIC kernels on release branches.
2004-01-28 09:19:16 +00:00
Ruslan Ermilov
1118e5b37a Only i386 and Alpha have the compat4x distribution. 2004-01-28 09:12:00 +00:00
John Baldwin
c0731f81d3 Overhaul our boot floppy generation system so that it scales better and
requires minimal care and feeding for future releases.
- Consolidate multitude of floppy related constants down to a normal
  FLOPPY set for 1.44 floppies and on PC98 a SMALLFLOPPY set for 1.2
  floppies.  Also, cleanup the i386 arch section by not duplicating
  constants that are the same on both machine types (i386 and pc98).
- Update the ZIPNSPLIT macro to generate a file chunks that will actually
  fit onto 1.44 floppies formatted with UFS1.  Unfortunately, split(1)
  seems to be somewhat buggy, so the files generated are slightly larger
  than the argument passed to split.
- Split the release.10 target into 3 targers: floppies.1, floppies.2 and
  floppies.3 that are added to EXTRAS only if NOFLOPPIES is defined.
  floppies.1 builds the install floppies, floppies.2 builds the fixit
  floppy, and floppies.3 generates the md5 sums and READMEs for the
  floppies/ directory.
- Drop the by now largely obsolete and less useful boot.flp picture.  This
  was more useful when the mfsroot lived inside the kernel rather than
  being loaded from a separate file by the loader.
- Only build a single mfsroot containing no modules that is used for all
  installation methods.
- Use split-file.sh to split up a gzipped GENERIC kernel into however many
  floppies it takes for the boot kernel.  Currently, a stock 5.2 GENERIC
  kernel including WITNESS, INVARIANTS, DDB, and other assorted bloat fits
  onto 2 additional floppies besides the boot floppy with some room to
  spare.
- If SPLIT_MFSROOT is defined, the mfsroot.gz file is similar split into
  however many floppies are needed.  Currently it is not defined as the
  mfsroot.gz fits onto the current boot.flp with room to spare.
- Add a 'makeFloppySet' target which builds a floppy set for a file that
  was split using split-file.sh.
- Rename the doMFSKERN target to 'buildBootFloppy' as that more closely
  matches what it does now.  We no longer build a custom BOOTMFS kernel for
  each boot floppy.
- We no longer build a 2.88 boot.flp image to use with emulated CD booting.
  The non-emulated cdboot works for almost everyone who boots off of CD and
  if it doesn't work on a particular machine, the user can always boot from
  the 1.44 floppy images.
- We no longer build a driver floppy or stick kernel modules in the mfsroot
  since we now use a stock kernel when booting from floppy.
2004-01-26 19:58:38 +00:00
Ruslan Ermilov
bbe8270c50 - Run makewhatis(1) in etc/Makefile at the end of "install".
- Removed redundant and undocumented NO_MAKEDB_RUN knob.
2004-01-22 08:18:37 +00:00
Ruslan Ermilov
4591175cd8 Use the reinstallkernel.debug target, now that we have it. 2004-01-21 08:24:44 +00:00
Makoto Matsushita
d9aeaacb6f Fix "5.x release on 4.x box" support.
It is required to check /etc/rc.d/ldconfig before use, because
${CHROOT} sandbox is sometimes 4.x world.  If /etc/rc.d/ldconfig
is not there, run ldconfig(8) directly.

Discussed with: imp, obrien, ru
2004-01-19 13:35:46 +00:00
Ruslan Ermilov
90165ba56f Once upon a time we had both "crypto" and "krb5" distributions,
and rebuilt some bits with crypto but without Kerberos support
(most notably SSH) during "make release", to put them into the
"crypto" distribution.

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

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

This should be a no-op change saving some "make release" time.
2004-01-17 19:22:36 +00:00
Ruslan Ermilov
a2cd4a0de6 MFRELENG_5_2: Default the snapshot versioning to 5.2.
PR:		misc/61402
Submitted by:	Chris Knight
2004-01-17 18:25:43 +00:00
Yoshihiro Takahashi
ba547cb42d Add missing '\' in previous change. 2004-01-15 10:17:43 +00:00
David E. O'Brien
b34a415e58 * if-like-constructs now use <TAB>body consistently.
* Long statements with '\' continuation now use <4 spaces>continuation
  consistently.
* wraps some long lines
* More consistent on how very simular repeated commands are wrapped.
2004-01-13 18:46:09 +00:00
Yoshihiro Takahashi
ab0a016c08 Use /etc/rc.d/ldconfig script rather than the ldconfig command directly.
Submitted by:	matusita
2004-01-12 08:37:32 +00:00
Yoshihiro Takahashi
e818ceb452 Run ldconfig in the chroot environment to find shared libraries in
/usr/local/lib.
2004-01-11 12:45:41 +00:00
David E. O'Brien
eb9bb3ee55 Automatically generate the CHECKSUM.MD5 file for ISO's.
Approved by:	scottl
2003-12-01 10:46:45 +00:00
Jun Kuriyama
bc5ffda652 Generate minimal /etc/group file for mfsroot tree.
This fixes newfs failures at installation.

Reviewed by:	re (scottl)
2003-11-15 03:58:12 +00:00
Jun Kuriyama
8a34b67a07 Fix ${LOCAL_PATCHES} (chdir was ignored). 2003-11-14 08:21:21 +00:00
Ruslan Ermilov
875ec8bdcf Combining "all" and "install" in one invocation is a very bad idea as
conditional evaluation is done only once in this case, and this may
not account for the fact that some conditionals would be evaluated
differently if "all" has already been run, like is the case with the
loader.help existance check in sys/boot/alpha/common/Makefile.common,
beforeinstall target.  This should fix Alpha snapshot builds.
2003-10-31 13:15:07 +00:00
Ruslan Ermilov
71c8601453 Correct the description of what the release.3 stage does nowadays. 2003-10-06 11:52:34 +00:00
Ruslan Ermilov
9c758be211 Make LOCAL_PATCHES accept multiple patch files, as its name suggests. 2003-09-21 06:33:14 +00:00
Ruslan Ermilov
3fb6c17186 For boot floppies, build a lightweight version of loader(8)
without Forth support.  Saves 28K of kern.flp and boot.flp
on i386.

Reviewed by:	jhb
2003-09-19 09:06:15 +00:00
David E. O'Brien
5bff585104 2nd part of making the name of the release running script overrideable. 2003-08-11 04:21:58 +00:00
David E. O'Brien
0febff82b7 Make the name of the release running script overrideable. 2003-08-10 09:54:22 +00:00
Ruslan Ermilov
a4f9e93c39 Added the new knob MINIROOT that, when set, causes the creation
of the bootable UFS image, miniroot.ufs, fully identical to the
contents of the "bootonly" CD-ROM.  The image is made available
on FTP as miniroot/miniroot.ufs.gz, for resemblance with NetBSD.

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

Reviewed by:	jhb
Tested by:	hrs
2003-08-08 21:00:57 +00:00
Ruslan Ermilov
8bf7ab359a - Eliminate the "rm" command that was causing us trouble in rev. 1.799.
- Normalize doRELEASE to avoid seeing "`ftp.1' is up to date." warning
  when doing "make rerelease", and ftp.1 was already built.

Reviewed by:	jhb
2003-08-07 18:22:34 +00:00
Ruslan Ermilov
3cd22041ce - Unbreak Alpha snapshots (we were still attempting to build a
no longer existing "fixit" crunched binary).

- Simplify the CRUNCH_TARGETS variable's initialization.

- Simplify the release.5 logic a bit by accounting for the fact
  that release/*_crunch.conf files were removed two years ago.
2003-08-06 08:09:40 +00:00
Andrey A. Chernov
087b057d37 Back out LC_ALL=C since tr here supposed to run under clean env -i
environment always.

Pointed by:     ru
2003-08-05 05:35:56 +00:00
Andrey A. Chernov
90862ca23d LANG->LC_ALL
Pointed by:     ru
2003-08-04 21:31:53 +00:00
Andrey A. Chernov
38407b8757 Prepend LANG=C to all tr 'a-z' 'A-Z' and vice versa.
Note: this is POSIX requirement, c-c ranges are portable only in POSIX locale
2003-08-04 15:47:43 +00:00
Ruslan Ermilov
8189277801 - Removed vestiges of the IA64 boot floppy support.
- Fixed the bootable CD-ROM support for IA64.

Reviewed by:	marcel
Tested by:	marcel
2003-08-03 15:06:00 +00:00
Ruslan Ermilov
6daa108fd1 - Boot-only CD-ROM support (bootonly.iso).
Submitted by:	jhb, ru

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

Submitted by:	jhb

Reviewed by:	ru, jhb
2003-08-02 18:21:02 +00:00
Ruslan Ermilov
6d44eb567d From now on, Alpha releases will come with NO_FLOPPIES.
Approved by:	consensus on freebsd-alpha

A replacement (miniboot.iso) is currently under development.
2003-07-31 07:28:58 +00:00
Ruslan Ermilov
eed31dc939 Revert last delta, sys/conf/kern.pre.mk,v 1.33 does the job.
OK'ed by:	scottl
2003-07-31 07:13:54 +00:00
Ruslan Ermilov
74345a8f83 The -Os kernel build with GCC 3.3.1 also requires -fno-strict-aliasing
to survive.

Discussed with:	bde
Tested on:	i386 and pc98
2003-07-30 14:46:46 +00:00
Ruslan Ermilov
9b72ad91bf Initialize the FIXCRYPTO, BINMAKE and related variables (that use
the != operator) only when needed.

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

Without this, attempt to "make release" caused an endless fork bomb
while trying to evaluate FIXCRYPTO, and the only way I could get
away from this on a remote box was to "kill -INT 1", thanks to
tcsh(1) and its internal "kill" command.
2003-07-30 14:33:32 +00:00
Ruslan Ermilov
f2eeb85de6 Embed a simplistic version of the dokern.sh script directly into
release/Makefile.

Reviewed by:	marcel

The original patch also removed ia64/dokern.sh, but this was OBE.
2003-07-30 07:40:45 +00:00
Ruslan Ermilov
f8cc06bea8 Moved the MFS root floppies creation code from release.10 to
doMFSKERN (where it logically belongs).
2003-07-30 07:13:31 +00:00
Ruslan Ermilov
0902bdbe14 Make IA64 a second port that comes with NO_FLOPPIES.
Reviewed by:	marcel
2003-07-29 18:29:44 +00:00
Scott Long
2272d4a4cb Bah, I go and get all preachy, and then commit from the wrong branch. Revert
the use of '-j8'.

Apologies to:	ru
2003-07-26 06:47:40 +00:00