From owner-freebsd-current@FreeBSD.ORG Tue Jul 13 23:22:28 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECEE916A4CE for ; Tue, 13 Jul 2004 23:22:28 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5891B43D2D for ; Tue, 13 Jul 2004 23:22:28 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i6DNMIHV092810; Tue, 13 Jul 2004 16:22:18 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i6DNMIRn009852; Tue, 13 Jul 2004 16:22:18 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i6DNMExw009851; Tue, 13 Jul 2004 16:22:14 -0700 (PDT) (envelope-from marcel) Date: Tue, 13 Jul 2004 16:22:14 -0700 From: Marcel Moolenaar To: Garance A Drosihn Message-ID: <20040713232214.GA9507@dhcp50.pn.xcllnt.net> References: <26075.1089753893@critter.freebsd.dk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="d6Gm4EdcadzBjdND" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i cc: Barney Wolff cc: Poul-Henning Kamp cc: current@freebsd.org Subject: Re: CVSUP and 5.2.1 RELEASE X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2004 23:22:29 -0000 --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 13, 2004 at 06:23:38PM -0400, Garance A Drosihn wrote: > > a) how about if we print a warning and exit if DESTDIR is > not defined? Are there "important" uses of `make world' > which do not use DESTDIR? My thoughts exactly. See attached patch. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="world.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/src/Makefile,v retrieving revision 1.300 diff -u -r1.300 Makefile --- Makefile 9 Jul 2004 13:55:50 -0000 1.300 +++ Makefile 13 Jul 2004 23:18:27 -0000 @@ -144,14 +144,17 @@ # Set a reasonable default .MAIN: all +.if defined(DESTDIR) .if make(world) STARTTIME!= LC_ALL=C date .endif # # world # -# Attempt to rebuild and reinstall *everything*, with reasonable chance of -# success, regardless of how old your existing system is. +# Attempt to rebuild and reinstall everything. This target is not to be +# used for upgrading an existing FreeBSD system, because the kernel is +# not included. One can argue that this target doesn't build everything +# then. # world: upgrade_checks @echo "--------------------------------------------------------------" @@ -178,6 +181,16 @@ @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 "'Using make world', for how to upgrade your system." + @echo "Define DESTDIR to the where you want to install FreeBSD, + @echo "including /, to override this warning and proceed as usual." + @echo "You have been warned..." +.endif # # kernel --d6Gm4EdcadzBjdND--