From owner-freebsd-arch  Sun Sep 17 18:16:14 2000
Delivered-To: freebsd-arch@freebsd.org
Received: from merc95.us.sas.com (merc95.us.sas.com [149.173.6.5])
	by hub.freebsd.org (Postfix) with ESMTP id D53A437B422
	for <freebsd-arch@FreeBSD.ORG>; Sun, 17 Sep 2000 18:16:11 -0700 (PDT)
Received: from merc95.us.sas.com ([127.0.0.1]) by merc95.us.sas.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2651.58)
	id TA8FLWGA; Sun, 17 Sep 2000 21:16:10 -0400
Received: from 10.28.149.26 by merc95.us.sas.com (InterScan E-Mail VirusWall NT); Sun, 17 Sep 2000 21:16:10 -0400 (Eastern Daylight Time)
Received: from bb01f39.unx.sas.com (bb01f39.unx.sas.com [10.16.2.246])
	by mozart.unx.sas.com (8.9.3 (PHNE_18979)/8.9.3) with ESMTP id VAA11151;
	Sun, 17 Sep 2000 21:16:10 -0400 (EDT)
Received: (from jwd@localhost)
	by bb01f39.unx.sas.com (8.9.3/8.9.1) id VAA09959;
	Sun, 17 Sep 2000 21:16:09 -0400 (EDT)
	(envelope-from jwd)
Date: Sun, 17 Sep 2000 21:16:09 -0400
From: John DeBoskey <jwd@unx.sas.com>
To: Warner Losh <imp@village.org>
Cc: freebsd-arch@FreeBSD.ORG
Subject: Re: Comments requested: automatic hook for mergemaster
Message-ID: <20000917211609.A9550@unx.sas.com>
References: <200009180042.SAA26812@harmony.village.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0.1i
In-Reply-To: <200009180042.SAA26812@harmony.village.org>; from imp@village.org on Sun, Sep 17, 2000 at 06:42:19PM -0600
Sender: owner-freebsd-arch@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Hi,

   I might be missing something here.

   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).

-John

----- Warner Losh's Original Message -----
> 
> Comments on the following.
> 
> Warner
> 
> 
> Index: Makefile.inc1
> ===================================================================
> RCS file: /home/imp/FreeBSD/CVS/src/Makefile.inc1,v
> retrieving revision 1.169
> diff -u -r1.169 Makefile.inc1
> --- Makefile.inc1	2000/09/09 14:37:06	1.169
> +++ Makefile.inc1	2000/09/18 00:41:05
> @@ -305,6 +305,9 @@
>  	done
>  	cd ${.CURDIR}; ${IMAKE} reinstall
>  	rm -rf ${INSTALLTMP}
> +.if defined(DO_MERGEMASTER)
> +	mergemaster
> +.endif
>  
>  #
>  # reinstall
> 
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-arch" in the body of the message

-- 
Failure is NOT an option!
It is built into every Micro$oft application.

... W2K is bigger, has a ton more features, and suffers from the
usual microsoft "better to have a feature with bugs than to not
have the feature at all" philosophy. 

FreeBSD... The choice of those who know how to choose...


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message