diff options
author | kato <kato@FreeBSD.org> | 1999-01-08 15:59:41 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1999-01-08 15:59:41 +0000 |
commit | f03733de5d79d02a761cfd7cfda60689bd7b6d7f (patch) | |
tree | 94519dfdfb43fc784a2790128ec0a6c914c2c744 /sys | |
parent | 362bef31c50d2950b07d010176376dc219352a18 (diff) | |
download | FreeBSD-src-f03733de5d79d02a761cfd7cfda60689bd7b6d7f.zip FreeBSD-src-f03733de5d79d02a761cfd7cfda60689bd7b6d7f.tar.gz |
Sync with sys/i386/conf/Makefile.i386 revision 1.133.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/Makefile.pc98 | 14 | ||||
-rw-r--r-- | sys/pc98/conf/Makefile.pc98 | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index eff3910..b62b6ff 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.47 1998/12/21 09:57:42 kato Exp $ +# $Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $ # # Makefile for FreeBSD # @@ -21,7 +21,7 @@ # Which version of config(8) is required. %VERSREQ= 300009 -KERNFORMAT?= aout +KERNFORMAT?= elf #STD8X16FONT?= iso @@ -215,6 +215,16 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi +.if ${KERNFORMAT} == "elf" && !defined(FORCE) + @if [ -f /kernel -a "`file /kernel 2>/dev/null | grep ELF`" = "" ]; then \ + echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ + echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ + echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ + echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ + echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ + exit 1 ; \ + fi +.endif .if exists(${DESTDIR}/kernel) chflags noschg ${DESTDIR}/kernel mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98 index eff3910..b62b6ff 100644 --- a/sys/pc98/conf/Makefile.pc98 +++ b/sys/pc98/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.47 1998/12/21 09:57:42 kato Exp $ +# $Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $ # # Makefile for FreeBSD # @@ -21,7 +21,7 @@ # Which version of config(8) is required. %VERSREQ= 300009 -KERNFORMAT?= aout +KERNFORMAT?= elf #STD8X16FONT?= iso @@ -215,6 +215,16 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi +.if ${KERNFORMAT} == "elf" && !defined(FORCE) + @if [ -f /kernel -a "`file /kernel 2>/dev/null | grep ELF`" = "" ]; then \ + echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ + echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ + echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ + echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ + echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ + exit 1 ; \ + fi +.endif .if exists(${DESTDIR}/kernel) chflags noschg ${DESTDIR}/kernel mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old |