Commit Graph

25 Commits

Author SHA1 Message Date
peter
07dee18730 I should know better than to touch this without testing a 'make release'
but ${MACHINE_ARCH} should be ${MACHINE} here.  pc98 has its own
GENERIC.hints file and should not be used with the i386 version.
2000-08-24 18:53:09 +00:00
jhb
9f676df9ea Add in a hack that installs 'src/sys/${MACHINE_ARCH}/GENERIC.hints' as
/boot/device.hints in the bin dist during releases so that current snapshots
have a chance of booting up ok after installing.  The real fix for this
problem is to rewrite userconfig in Forth, stick it in the loader, axe
userconfig from the kernel, and extract the hints from the booted kernel in
sysinstall similar to the way we generate /boot/kernel.conf right now.  For
now, however, this will have to do.
2000-08-17 05:43:41 +00:00
obrien
53eb2d3431 If "MODULES_WITH_WORLD" is defined, sys/modules will be built with the
world as was our old way, rather than when building a kernel.

Some people do not like the new way, and the release building still assumes
modules are built with the world.
2000-06-17 10:51:56 +00:00
chuckr
5f34b128da Cause modules to build with the kernel build. Modules are removed
from the sys Makefile's SUBDIRs.  This is conditioned in make.conf by the
NO_MODULES variable and the existence of the modules directory.  The
actual location of the modules is not modified.  Changes in Makefiles
only, this does not affect Peter's recent changes.

Reviewed by:	Peter Wemm, who warned me I would get some flack, and
		he had the good idea for the NO_MODULES variable.
2000-05-02 02:26:04 +00:00
peter
e40c669c6b Remove the old a.out-only boot loader, we don't use it any more.
The new boot1/boot2 can load a.out and elf kernels directly.
I think the sys/pc98 version can go too as the sys/boot/pc98 code
appears to be functional, but I'll leave that for the pc98 folks.

"There can be only one."
2000-03-19 11:42:34 +00:00
marcel
17ed6e05da ${MACHINE} -> ${MACHINE_ARCH}
All Makefiles now use MACHINE_ARCH for the target architecture.
Unification is required for cross-building.

Tags added to:
	sys/boot/Makefile
	sys/boot/arc/loader/Makefile
	sys/kern/Makefile
	usr.bin/cpp/Makefile
	usr.bin/gcore/Makefile
	usr.bin/truss/Makefile

usr.bin/gcore/Makefile:
	fixed typo: MACHINDE -> MACHINE_ARCH
1999-11-14 13:54:44 +00:00
peter
3b842d34e8 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
kato
c8eab8c863 Use MACHINE_ARCH instead of MACHINE to check x86 architecture.
Pointed out by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
1999-06-03 10:38:07 +00:00
jkoshy
d9c0066701 Use ${.CURDIR} in `exists()' constructs.
PR:		misc/4395
Submitted by:	J Wunsch <j@ida.interface-business.de>
1999-04-21 11:09:40 +00:00
bde
c7d4679276 Backed out previous commit. It depends on a.out utilities and libraries
somehow being available even on pure elf systems.
1998-12-30 12:06:08 +00:00
bde
ddd867ad2c Always build ${MACHINE}/boot if it exists. Makefiles shouldn't know
about deficiencies in subdirs.
1998-12-30 11:17:09 +00:00
peter
b1b96c5c5f Build KLD modules, these work for both a.out and elf. 1998-11-03 06:50:58 +00:00
rnordier
58a6212678 In src/Makefile.inc1:
Remove /sys/boot from legacy-build.
    Add btxld to build-tools.
In src/sys/Makefile:
    Add /sys/boot for i386 ELF.

I'm still not sure why the new boot code was being built along with the
legacy stuff, which meant a completely wrong default environment for it.

This may well still be the wrong way to go about this, but it can't work
all that much worse than it has been.
1998-10-11 18:39:38 +00:00
gpalmer
fd3a4fe5e0 Build the new boot loader on the alpha. This allows make release to work again. 1998-10-04 00:42:08 +00:00
jb
e53f0d692a Add support for MACHINE=pc98. This leaves a single legacy entry for
the old aout bootloader.
1998-09-05 08:27:56 +00:00
jb
3910803676 Only build the old boot loader on i386 if aout. The new loader will
eventually be built if elf.
1998-08-27 04:26:40 +00:00
jb
2efe016de4 Test for the existance of ${MACHINE}/boot before trying to build it.
The PC98 stuff in this makefile should be removed and that system
should build with MACHINE=pc98 and MACHINE_ARCH=i386.
1998-02-20 07:37:08 +00:00
jkh
74df5988ae Commit a long-forgotten tweak for building tags in /usr/src/sys. 1997-07-13 07:36:20 +00:00
peter
94b6d72794 Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not
ready for it yet.
1997-02-22 09:48:43 +00:00
jkh
808a36ef65 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.
1997-01-14 07:20:47 +00:00
asami
36a1932601 The Great PC98 Merge.
All new code is "#ifdef PC98"ed so this should make no difference to
PC/AT (and its clones) users.

Ok'd by:	core
Submitted by:	FreeBSD(98) development team
1996-06-14 11:02:28 +00:00
bde
49ed6a09d1 Removed almost all traces of libkern.a. The objects that were in
libkern.a are now specified by listing their source files in
files.${MACHINE}.  The list is machine-dependent to save space.
All the necessary object for each machine must be linked into the
kernel in case an lkm wants one.
1995-12-26 13:58:31 +00:00
paul
2239e40cd8 Added ${MACHINE}/boot to build bootblocks.
Submitted by:	Paul Richards
1994-08-25 13:54:28 +00:00
dg
8d205697aa Added $Id$ 1994-08-02 07:55:43 +00:00
rgrimes
f734c06c4d Add this so that the top level Makefile can traverse down into here
and build libkern.  This will be enhanced later to build other things.
1994-05-28 04:10:32 +00:00