From owner-freebsd-hackers  Mon Oct 23 16:16:56 1995
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id QAA05450
          for hackers-outgoing; Mon, 23 Oct 1995 16:16:56 -0700
Received: from hutcs.cs.hut.fi (root@hutcs.cs.hut.fi [130.233.192.2])
          by freefall.freebsd.org (8.6.12/8.6.6) with SMTP id QAA05444
          for <freebsd-hackers@freebsd.org>; Mon, 23 Oct 1995 16:16:53 -0700
Received: from shadows.cs.hut.fi by hutcs.cs.hut.fi with SMTP id AA12051
  (5.65c8/HUTCS-S 1.4 for <freebsd-hackers@freebsd.org>); Tue, 24 Oct 1995 01:16:48 +0200
Received: (hsu@localhost) by shadows.cs.hut.fi (8.6.10/8.6.10) id BAA17630; Tue, 24 Oct 1995 01:16:59 +0200
Date: Tue, 24 Oct 1995 01:16:59 +0200
Message-Id: <199510232316.BAA17630@shadows.cs.hut.fi>
From: Heikki Suonsivu <hsu@cs.hut.fi>
To: "Ron G. Minnich" <rminnich@Sarnoff.COM>
Cc: freebsd-hackers@freebsd.org
In-Reply-To: "Ron G. Minnich"'s message of 23 Oct 1995 21:56:19 +0200
Subject: upgrade 2.05 to 2.1
Sender: owner-hackers@freebsd.org
Precedence: bulk


   keyboards, which will need to go to 2.1 soon i suppose (and hopefully 2.1
   has fixed msync ...). Anyone have a reasonable upgrade hack to make this
   sort of thing easy. I did one script for 2.0 -> 2.05, basically via 
   rdist, but there has to be a better way, right? maybe? 

I do this to upgrade my machines, though I do upgrades in smaller steps by
supping the sources frequently:
- do full make world in one machine and create a new kernel,
- test it runs fine,
- mount the src/obj trees to all other machines to be upgraded
- do a make reinstall (patch follows)
- switch the kernel
- reboot installed machine

reinstall rule just reinstalls everything.  I have been running these
simultaneously.  I even have reinstalled a 386-16 machine from on nfs mount
over a 38.4k PPP link, within 24 hours.  I really missed IP-level
compression :-)

*** Makefile.orig	Fri Aug  4 17:58:32 1995
--- Makefile	Thu Aug 24 21:55:08 1995
***************
*** 8,13 ****
--- 8,14 ----
  #	-DMAKE_EBONES to build eBones (KerberosIV)
  #
  #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+ #	-DNOCLEAN do not clean at all
  #	-DNOCRYPT will prevent building of crypt versions
  #	-DNOLKM do not build loadable kernel modules
  #	-DNOOBJDIR do not run ``${MAKE} obj''
***************
*** 86,103 ****
  .else
  OBJDIR=		obj
  .endif
  .if defined(NOCLEANDIR)
  CLEANDIR=	clean
  .else
  CLEANDIR=	cleandir
  .endif
  
! world:	hierarchy mk cleandist includes lib-tools libraries tools
  	@echo "--------------------------------------------------------------"
  	@echo " Rebuilding ${DESTDIR} The whole thing"
  	@echo "--------------------------------------------------------------"
  	@echo
  	${MAKE} depend all install
  	cd ${.CURDIR}/share/man &&		${MAKE} makedb
  
  hierarchy:
--- 87,119 ----
  .else
  OBJDIR=		obj
  .endif
+ 
+ .if defined(NOCLEAN)
+ CLEANDIR=
+ WORLD_CLEANDIST=obj
+ .else
+ WORLD_CLEANDIST=cleandist
  .if defined(NOCLEANDIR)
  CLEANDIR=	clean
  .else
  CLEANDIR=	cleandir
  .endif
+ .endif
  
! world:	hierarchy mk $(WORLD_CLEANDIST) includes lib-tools libraries tools
  	@echo "--------------------------------------------------------------"
  	@echo " Rebuilding ${DESTDIR} The whole thing"
  	@echo "--------------------------------------------------------------"
  	@echo
  	${MAKE} depend all install
+ 	cd ${.CURDIR}/share/man &&		${MAKE} makedb
+ 
+ reinstall:	hierarchy mk includes
+ 	@echo "--------------------------------------------------------------"
+ 	@echo " Reinstalling ${DESTDIR} The whole thing"
+ 	@echo "--------------------------------------------------------------"
+ 	@echo
+ 	${MAKE} install
  	cd ${.CURDIR}/share/man &&		${MAKE} makedb
  
  hierarchy:

-- 
Heikki Suonsivu, T{ysikuu 10 C 83/02210 Espoo/FINLAND,
hsu@cs.hut.fi  home +358-0-8031121 work -4513377 fax -4555276  riippu SN