From owner-freebsd-arch Sun Sep 17 18:51:16 2000 Delivered-To: freebsd-arch@freebsd.org Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id 159AD37B422 for ; Sun, 17 Sep 2000 18:51:14 -0700 (PDT) Received: from gorean.org (doug@master [10.0.0.2]) by dt051n37.san.rr.com (8.9.3/8.9.3) with ESMTP id SAA61239; Sun, 17 Sep 2000 18:50:59 -0700 (PDT) (envelope-from DougB@gorean.org) Message-ID: <39C57502.A0D1E3CA@gorean.org> Date: Sun, 17 Sep 2000 18:50:58 -0700 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.75 [en] (X11; U; FreeBSD 5.0-CURRENT-091 i386) X-Accept-Language: en MIME-Version: 1.0 To: Alan Clegg Cc: freebsd-arch@FreeBSD.ORG Subject: Re: Comments requested: automatic hook for mergemaster References: <200009180042.SAA26812@harmony.village.org> <20000917211609.A9550@unx.sas.com> <20000917212421.A69645@diskfarm.firehouse.net> Content-Type: multipart/mixed; boundary="------------9E059BE290C0194B4DD03BA4" Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This is a multi-part message in MIME format. --------------9E059BE290C0194B4DD03BA4 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Alan Clegg wrote: > > Unless the network is lying to me again, John DeBoskey said: > > > What happens to a nightly 'make world' process if DO_MERGEMASTER > > is defined? We'd need a completely non-interactive approach > > to make this work (I'm not 100% familiar with mergemaster's > > internal workings). > > In addition, we will definitely need MERGEMASTER_FLAGS or somesuch so that > we can specify all of the needed flags. I think a _FLAGS variable is a good idea. Also, mm already has an "autorun" mode that deletes files that match from the temproot environment and prints helpful messages for the ones that remain. The attached patch might be better. Doug -- "The dead cannot be seduced." - Kai, "Lexx" Do YOU Yahoo!? --------------9E059BE290C0194B4DD03BA4 Content-Type: text/plain; charset=us-ascii; name="Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Makefile.patch" Index: Makefile.inc1 =================================================================== RCS file: /usr/ncvs/src/Makefile.inc1,v retrieving revision 1.170 diff -u -r1.170 Makefile.inc1 --- Makefile.inc1 2000/09/17 21:02:58 1.170 +++ Makefile.inc1 2000/09/18 01:46:36 @@ -305,6 +305,10 @@ done cd ${.CURDIR}; ${IMAKE} reinstall rm -rf ${INSTALLTMP} +.if defined(DO_MERGEMASTER) + MERGEMASTER_FLAGS?= -a + mergemaster ${MERGEMASTER_FLAGS} +.endif # # reinstall --------------9E059BE290C0194B4DD03BA4-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message