On Sat, 16 Oct 2004 16:11:40 +0200
Sascha Wildner <saw@online.de> wrote:
> Hi,
>
> the comments in /usr/src/Makefile and the build(7) man page still refer
> to mergemaster for upgrading. Here's a small patch that corrects this:
>
> http://yoyodyne.ath.cx/tmp/mergemaster.patch
>
> Regards,
> Sascha
>
> --
> http://yoyodyne.ath.cx
>
Should 'make upgrade' add to Makefile's patch instead of 'mergemaster', as
well as build's patch?
--- Makefile.orig 2004-10-18 00:02:34.000000000 +0900
+++ Makefile 2004-10-18 00:04:29.000000000 +0900
@@ -53,13 +53,12 @@
# 2. `make buildworld'
# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
-# 5. `reboot' (in single user mode: boot -s from the loader prompt).
-# 6. `mergemaster -p'
-# 7. `make installworld'
-# 8. `mergemaster'
-# 9. `reboot'
+# 5. `make installworld'
+# 6. `make upgrade'
+# 7. `reboot'
#
-# See src/UPDATING `COMMON ITEMS' for more complete information.
+# See src/UPDATING `Upgrading DragonFly on an existing DragonFly system.'
+# for more complete information.
#
# If TARGET_ARCH=arch (e.g. amd64) is specified you can
# cross build world for other architectures using the buildworld target,
Regards.
--
H.Miyamoto (aka "Yuukis"). <Ys@PixyGarden.net>
http://wids.net/ - Enjoy Your Computing ?