diff options
author | peter <peter@FreeBSD.org> | 1999-01-07 07:20:41 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-01-07 07:20:41 +0000 |
commit | 438d7c9f8e2b32116e73f749f2fdee100a545f78 (patch) | |
tree | 627f75a4e058f08ae4d88d105c4e4a95800eecdc | |
parent | ea7fa796872cd5bf550f062e35482087cd6b9e1c (diff) | |
download | FreeBSD-src-438d7c9f8e2b32116e73f749f2fdee100a545f78.zip FreeBSD-src-438d7c9f8e2b32116e73f749f2fdee100a545f78.tar.gz |
The upgrade process from 2.2.x -> 3.0-ELF assumes the existence of
GENERICupgrade, which got kinda fried. Try to copy GENERIC if the
user has not supplied their own.
-rw-r--r-- | Makefile.upgrade | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.upgrade b/Makefile.upgrade index d9391f2..c32b318 100644 --- a/Makefile.upgrade +++ b/Makefile.upgrade @@ -1,5 +1,5 @@ # -# $Id: Makefile.upgrade,v 1.7 1998/10/17 05:40:45 peter Exp $ +# $Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $ # # This makefile contains rules for preforming upgrades that are outside # the scope of the normal build world process. @@ -206,11 +206,17 @@ ${MAKEOBJDIRPREFIX}/do_aout_kernel : .if exists(${.CURDIR}/sys/compile/GENERICupgrade) @rm -rf ${.CURDIR}/sys/compile/GENERICupgrade .endif +.if !exists(${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade) + -cp ${.CURDIR}/sys/${MACHINE}/conf/GENERIC \ + ${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade +.endif @cd ${.CURDIR}/sys/${MACHINE}/conf; config GENERICupgrade @-cd ${.CURDIR}/sys/compile/GENERICupgrade; \ - OBJFORMAT=aout make depend && make all + OBJFORMAT=aout make KERNFORMAT=aout depend && \ + OBJFORMAT=aout make KERNFORMAT=aout all @cd ${.CURDIR}/sys/compile/GENERICupgrade; \ - OBJFORMAT=aout make depend && make all + OBJFORMAT=aout make KERNFORMAT=aout depend && \ + OBJFORMAT=aout make KERNFORMAT=aout all .endif @touch ${MAKEOBJDIRPREFIX}/do_aout_kernel |