Date: Mon, 19 Jun 2000 15:33:43 -0700 From: Kent Stewart <kstewart@3-cities.com> To: ponomare@uni-duesseldorf.de Cc: freebsd-stable@FreeBSD.org Subject: Re: make buildworld Message-ID: <394E9FC7.A25BA525@3-cities.com> References: <00061813342700.01257@ponomare.krion> <00061921455100.00810@ponomare.krion> <394E7E7F.19C23DF@3-cities.com> <00062000194800.00868@ponomare.krion>
next in thread | previous in thread | raw e-mail | index | archive | help
Kirill Ponomarew wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > > sorry maybe my question is fool (I'm working with FreeBSD only 1 month) but > what is the main difference between make buildworld and make mergemaster ? > As far as I understood make buildworld refresh almost everything on the system > and make mergemaster refresh /etc directory ? > > I've cleaned /usr/obj directory and made cvsup manual: > $bash cvsup /usr/share/examples/cvsup/standard-supfile > $bash cvsup /usr/share/examples/cvsup/secure-supfile > $bash cd /usr/src > $bash make buildworld Mergemaster is a shell script that compares your /etc against what is expected by the new make world. You either do it manually or use an automated procedure. Mergemaster is the automated procedure. My make world sequence is make buildworld config and make kernal and install it. reboot to single user mode and make installworld run mergemaster and reboot I do it this way because if the new kernel doesn't work, I can still boot /kernel.old and have a working system that I can use repair the new damage. Once you installworld, that isn't true. A recovery is called a clean install :). My first encounter with mergemaster was at 3.2-RC. Changes were coming faster than I could build and install. Someone suggested I use mergemaster and I found I could keep up. I could make my world, a new kernal in around an hour. A manual compare of /etc to the one in /tmp was taking 3 or 4 hours. There wasn't any question in my mind as to what was more effective :). Kent > > /usr/obj/usr/src/i386/usr/src/gnu/usr.bin/cc/cc1plus/../cc_int/libcc_int.a(c-decl.o): In function `finish_struct': > c-decl.o(.text+0x6ae8): multiple definition of `finish_struct' > class.o(.text+0x4f94): first defined here > /usr/libexec/elf/ld: Warning: size of symbol `finish_struct' changed from 286 to 1572 in c-decl.o > /usr/obj/usr/src/i386/usr/src/gnu/usr.bin/cc/cc1plus/../cc_int/libcc_int.a(c-decl.o)(.data+0x58): multiple definition of `dollars_in_ident' > decl2.o(.data+0x3c): first defined here > /usr/obj/usr/src/i386/usr/src/gnu/usr.bin/cc/cc1plus/../cc_int/libcc_int.a(c-decl.o): In function `print_lang_identifier': > > and on the same place I've got the same error > > Kent Stewart wrote: > > | I've never used a "make upgrade" to go from a release to a stable. I > | have only cd'ed to src/ and did a "make buildworld". I usually do a > | "time make buildworld" so that I can see how long it takes. The main > | thing on 4.0-R to 4.0-S is upgrading your /etc files when you get > | through. I use mergemaster to do that. You might have to cd /usr/obj > | and clean it out. I usually rm -rf *, and then chflag the tree and > | then do a 2nd rm. The rm is already in the history and can be "!" > | selected. There are only 4 files that have to be chflag'ed and there > | isn't any point in doing all of the files. This makes the whole > | process a little bit faster. > > -- > Kirill Ponomarew > > -----BEGIN PGP SIGNATURE----- > Version: PGPfreeware 5.0i for non-commercial use > MessageID: Avuwxq8TLpWtYGCkspRUuZePASTpIwEY > > iQA/AwUBOU6ch7SU3AmMQCDLEQLyVwCeLZ86DA0XAeLByj9RNDM1qgw9nYkAnA3H > nBnVvLvbjv6/ZSoHRxC32EV9 > =7IFf > -----END PGP SIGNATURE----- > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message -- Kent Stewart Richland, WA mailto:kstewart@3-cities.com http://www.3-cities.com/~kstewart/index.html FreeBSD News http://daily.daemonnews.org/ SETI(Search for Extraterrestrial Intelligence) @ HOME http://setiathome.ssl.berkeley.edu/ Hunting Archibald Stewart, b 1802 in Ballymena, Antrim Co., NIR http://www.3-cities.com/~kstewart/genealogy/archibald_stewart.html To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?394E9FC7.A25BA525>