From owner-freebsd-questions Wed Feb 13 9:47:12 2002 Delivered-To: freebsd-questions@freebsd.org Received: from brain-stream.com (brain-stream.com [209.95.107.206]) by hub.freebsd.org (Postfix) with ESMTP id A216237B426 for ; Wed, 13 Feb 2002 09:46:53 -0800 (PST) Received: from laptop.pobox.com (h00609708e398.ne.mediaone.net [24.128.187.79]) by brain-stream.com (8.9.3/8.9.3) with ESMTP id JAA07213 for ; Wed, 13 Feb 2002 09:46:47 -0800 (PST) Message-Id: <5.1.0.14.2.20020213124225.01bd2ec0@pop.earthlink.net> X-Sender: bdelong@pop.earthlink.net (Unverified) X-Mailer: QUALCOMM Windows Eudora Version 5.1 Date: Wed, 13 Feb 2002 12:49:51 -0500 To: freebsd-questions@FreeBSD.ORG From: "B.K. DeLong" Subject: Using MergeMaster/ Release-to-Stable Process? Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; format=flowed Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hey all - I'm currently biding my time while a "make buildworld" completes after doing a cvsup of 4.5. Previous to this install, I had 4.4 and when I completed all the various make commands, I ran mergemaster. I haven't the slightest clue of how mergemaster works and whether I should be merging sources, deleting them or inserting them. Last time I just "saved it for later" and did nothing. Does anyone have a good guide or tips to using mergemaster? Should I just merge the new stuff? Insert it? Also, here's the process I'm using. Is this right? 1. cvsup /etc/stable-supfile 2. make buildworld 3. make installworld 4. make buildkernel KERNCONF=FIREWALL 5. make installkernel KERNCONF=FIREWALL 6. mergemaster (what to do when I run it??) 7. make clean * Do I need KERNCONF for 2 or 3? *Does "make clean" get rid of unneeded files from this process? Or should I delete something? Last time I did the cvsup and all the makes plus mergemaster I ended up filling /usr with 1GB of stuff *Is there any place in the above procedure I should be rebooting? Thanks in advance for any help and advice. -- B.K. DeLong bkdelong@pobox.com 617.877.3271 http://www.brain-stream.com Play. http://www.the-leaky-cauldron.org Potter. http://www.attrition.org Security. http://www.artemisiabotanicals.com Herb. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message