From owner-cvs-src@FreeBSD.ORG Thu Jun 22 07:35:34 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89ABC16A47E; Thu, 22 Jun 2006 07:35:34 +0000 (UTC) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3622143D55; Thu, 22 Jun 2006 07:35:32 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.6/8.13.6) with ESMTP id k5M7ZOo7065293; Thu, 22 Jun 2006 00:35:24 -0700 (PDT) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.6/8.13.1/Submit) id k5M7ZOKV065292; Thu, 22 Jun 2006 00:35:24 -0700 (PDT) (envelope-from obrien) Date: Thu, 22 Jun 2006 00:35:23 -0700 From: "David O'Brien" To: John Baldwin Message-ID: <20060622073523.GB64578@dragon.NUXI.org> References: <20060607194300.7565e832.trhodes@FreeBSD.org> <200606201516.39121.jhb@freebsd.org> <20060620.144125.84360497.imp@bsdimp.com> <200606201714.10331.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606201714.10331.jhb@freebsd.org> X-Operating-System: FreeBSD 7.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.11 Cc: trhodes@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, "M. Warner Losh" , cvs-src@freebsd.org Subject: Re: cvs commit: src Makefile README X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2006 07:35:34 -0000 On Tue, Jun 20, 2006 at 05:14:09PM -0400, John Baldwin wrote: > Fair enough. How about just making it undocumented again then? :) Or if 'make world' is desired to be disabled, there's also this approach: Index: Makefile =================================================================== RCS file: /home/ncvs/src/Makefile,v retrieving revision 1.332 diff -u -p -r1.332 Makefile --- Makefile 7 Jun 2006 03:33:48 -0000 1.332 +++ Makefile 20 Jun 2006 19:10:51 -0000 @@ -33,13 +33,6 @@ # If you want to build your system from source be sure that /usr/obj has # at least 400MB of diskspace available. # -# For individuals wanting to build from the sources currently on their -# system, the simple instructions are: -# -# 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). -# 3. `make world' -# # For individuals wanting to upgrade their sources (even if only a # delta of a few days): # @@ -163,7 +157,7 @@ ${TGTS}: STARTTIME!= LC_ALL=C date -.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) +.if defined(HISTORICAL_MAKE_WORLD) # # world # @@ -197,22 +191,45 @@ world: upgrade_checks @echo ">>> make world completed on `LC_ALL=C date`" @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" -.else -world: - @echo "WARNING: make world will overwrite your existing FreeBSD" - @echo "installation without also building and installing a new" - @echo "kernel. This can be dangerous. Please read the handbook," - @echo "'Rebuilding world', for how to upgrade your system." - @echo "Define DESTDIR to where you want to install FreeBSD," - @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." - @echo "" - @echo "Bailing out now..." - @false .endif -- -- David (obrien@FreeBSD.org)