From 51c5836ce49f72208fd28ff84bebc2aa250f6ebf Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Thu, 7 Jan 1999 07:20:41 +0000 Subject: [PATCH] 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. --- Makefile.upgrade | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.upgrade b/Makefile.upgrade index d9391f289adf..c32b31868602 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. @@ -205,12 +205,18 @@ ${MAKEOBJDIRPREFIX}/do_aout_kernel : @echo "--------------------------------------------------------------" .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