diff options
| author | peter <peter@FreeBSD.org> | 2001-01-22 07:29:48 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-22 07:29:48 +0000 |
| commit | ee06b9ce9268dcfdd65b4b7adc6cbd86e7c93b4c (patch) | |
| tree | 9e8ae0c932fb786c92ced369809b9c531a28d9c9 /Makefile.inc1 | |
| parent | 13a64523e9313c2b477a7aafcf987717f2d6a0f5 (diff) | |
| download | FreeBSD-src-ee06b9ce9268dcfdd65b4b7adc6cbd86e7c93b4c.zip FreeBSD-src-ee06b9ce9268dcfdd65b4b7adc6cbd86e7c93b4c.tar.gz | |
Using "KERNEL" for buildkernel was a very very bad mistake. $KERNEL is
already used by the kernel makefiles themselves, and this leads to a lot
of trouble when people put "KERNEL=MYKERNEL" in make.conf. Bite the bullet
and change it to KERNCONF instead, before it gets too far entrenched.
The kernel Makefiles use ${KERNEL} as the name of what to install the
kernel as, eg: /boot/${KERNEL}/kernel or /${KERNEL}. This leads to much
unhappiness with things like /LOCAL instead of /kernel. buildkernel is
severely limited as it is only useful directly after a buildworld.
Reviewed by: jhb
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c7fdc79..494eb28 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -342,7 +342,7 @@ distribworld: # buildkernel and installkernel # # Which kernels to build and/or install is specified by setting -# KERNEL. If not defined a GENERIC kernel is built/installed. +# KERNCONF. If not defined a GENERIC kernel is built/installed. # Only the existing (depending MACHINE) config files are used # for building kernels and only the first of these is designated # as the one being installed. @@ -352,7 +352,7 @@ distribworld: # be set to cross-build, we have to make sure MACHINE is set # properly. -KERNEL?= GENERIC +KERNCONF?= GENERIC INSTKERNNAME?= kernel # The only exotic MACHINE_ARCH/MACHINE combination valid at this @@ -372,7 +372,7 @@ CONFIGARGS+= -r BUILDKERNELS= INSTALLKERNEL= -.for _kernel in ${KERNEL} +.for _kernel in ${KERNCONF} .if exists(${KRNLCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} .if empty(INSTALLKERNEL) @@ -388,7 +388,7 @@ INSTALLKERNEL= ${_kernel} # buildkernel: .if empty(BUILDKERNELS) - @echo ">>> ERROR: Missing kernel configuration file(s) (${KERNEL})." + @echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})." @false .endif @echo |
