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> In-Reply-To: <200009180042.SAA26812@harmony.village.org>; from imp@village.org on Sun, Sep 17, 2000 at 06:42:19PM -0600 References: <200009180042.SAA26812@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000917211609.A9550>