Date: Fri, 25 Jun 2004 00:27:19 +0200 From: Frerich Raabe <raabe@kde.org> To: freebsd-current@freebsd.org Subject: Patch for src/UPDATING Message-ID: <200406250027.19459.raabe@kde.org>
next in thread | raw e-mail | index | archive | help
--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 @@
<maybe fix /etc/fstab> [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]
<reboot in single user> [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]
<reboot>
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406250027.19459.raabe>