From owner-freebsd-bugs@FreeBSD.ORG Fri Nov 11 12:40:15 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFBC316A41F for ; Fri, 11 Nov 2005 12:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DED343D53 for ; Fri, 11 Nov 2005 12:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jABCeEwG037496 for ; Fri, 11 Nov 2005 12:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jABCeEnn037495; Fri, 11 Nov 2005 12:40:14 GMT (envelope-from gnats) Resent-Date: Fri, 11 Nov 2005 12:40:14 GMT Resent-Message-Id: <200511111240.jABCeEnn037495@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Luca Morettoni Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E8CA16A41F for ; Fri, 11 Nov 2005 12:32:47 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1121F43D49 for ; Fri, 11 Nov 2005 12:32:47 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jABCWk7h084271 for ; Fri, 11 Nov 2005 12:32:46 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id jABCWksn084270; Fri, 11 Nov 2005 12:32:46 GMT (envelope-from nobody) Message-Id: <200511111232.jABCWksn084270@www.freebsd.org> Date: Fri, 11 Nov 2005 12:32:46 GMT From: Luca Morettoni To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/88840: Enable use of CVSROOT variable into src Makefile (for update target) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2005 12:40:15 -0000 >Number: 88840 >Category: misc >Synopsis: Enable use of CVSROOT variable into src Makefile (for update target) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 11 12:40:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Luca Morettoni >Release: 5.4-STABLE >Organization: >Environment: FreeBSD home.morettoni.local 5.4-STABLE FreeBSD 5.4-STABLE #162: Tue Oct 11 01:01:40 CEST 2005 luca@home.morettoni.local:/usr/obj/usr/src/sys/HOME i386 >Description: If you set CVS_UPDATE in make.conf you can update system source files by CVS system. If you want to change the CVS server you can set the CVSROOT, but the code in Makefile.inc1 did not take that parameter. >How-To-Repeat: cd /usr/src; make -DCVS_UPDATE -DCVSROOT=xxx the new XXX server is ignored. >Fix: Apply this little patch and now (if you define CVSROOT var) cvs use new server address, otherwise it update from the default server! --- Makefile.inc1.original Fri Nov 11 13:14:40 2005 +++ Makefile.inc1 Fri Nov 11 13:17:42 2005 @@ -765,7 +765,11 @@ @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} @echo "--------------------------------------------------------------" +.if defined(CVSROOT) + cd ${.CURDIR}; ${CVS} -R -q -d ${CVSROOT} update ${CVSFLAGS} +.else cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS} +.endif .endif # >Release-Note: >Audit-Trail: >Unformatted: