From owner-freebsd-current@FreeBSD.ORG Thu Jun 24 22:30:06 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1D4E16A4CE for ; Thu, 24 Jun 2004 22:30:06 +0000 (GMT) Received: from mail.gmx.net (mail.gmx.de [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id BDE4B43D55 for ; Thu, 24 Jun 2004 22:30:05 +0000 (GMT) (envelope-from frerich.raabe@gmx.de) Received: (qmail 12074 invoked by uid 65534); 24 Jun 2004 22:29:27 -0000 Received: from p50821B2D.dip.t-dialin.net (EHLO daedalus.lan) (80.130.27.45) by mail.gmx.net (mp005) with SMTP; 25 Jun 2004 00:29:27 +0200 X-Authenticated: #270069 Received: from daedalus.lan (localhost [127.0.0.1]) by daedalus.lan (8.12.11/8.12.11) with ESMTP id i5OMTZef000829 for ; Fri, 25 Jun 2004 00:29:36 +0200 (CEST) (envelope-from frerich@daedalus.lan) Received: by daedalus.lan (8.12.11/8.12.11/Submit) id i5OMRJ3m000805 for freebsd-current@freebsd.org; Fri, 25 Jun 2004 00:27:19 +0200 (CEST) (envelope-from frerich) From: Frerich Raabe To: freebsd-current@freebsd.org Date: Fri, 25 Jun 2004 00:27:19 +0200 User-Agent: KMail/1.6.2 MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_HV12ACp9EPdukXg" Message-Id: <200406250027.19459.raabe@kde.org> X-Mailman-Approved-At: Fri, 25 Jun 2004 11:42:40 +0000 Subject: Patch for src/UPDATING X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 22:30:06 -0000 --Boundary-00=_HV12ACp9EPdukXg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Moin, I attached a patch against the UPDATING file, fixing a few flaws in the description of how to do an in-place update of 4-STABLE to 5-CURRENT which I noticed while doing exactly that update. Reviewal (and possible subsequent commit) would be much appreciated. - Frerich --Boundary-00=_HV12ACp9EPdukXg Content-Type: text/x-diff; charset="us-ascii"; name="UPDATING.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="UPDATING.diff" --- UPDATING.orig Sun Jun 20 20:51:23 2004 +++ UPDATING Sun Jun 20 20:56:07 2004 @@ -1506,16 +1506,16 @@ [7] make buildworld [9] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - cp src/sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] + cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - cd src/sys/boot ; make install [6] + cd sys/boot ; make STRIP="" install [6] [1] [3] - /etc/rc.d/preseedrandom [10] + /usr/src/etc/rc.d/preseedrandom [10] mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] + mergemaster -i [4] Make sure that you've read the UPDATING file to understand the @@ -1585,7 +1585,13 @@ that is hard to boot to recover. [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. + cvs prune empty directories. Also, if CPUTYPE is defined in your + /etc/make.conf, make sure to use the "?=" instead of the "=" assignment + operator, so that buildworld can override the CPUTYPE if it needs to. + In case you would like to avoid installing new packages of everything, + you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x + compatibility libraries are build which should allow you to continue + using your existing software for a while. [10] In order to create temporary files, /dev/random must be initialized by feeding data into it. /etc/rc.d/preseedrandom --Boundary-00=_HV12ACp9EPdukXg--