From owner-freebsd-bugs@FreeBSD.ORG Fri Jun 30 02:00:37 2006 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 2A90316A40F for ; Fri, 30 Jun 2006 02:00:37 +0000 (UTC) (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 5FB3343D55 for ; Fri, 30 Jun 2006 02:00:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5U20aH0014118 for ; Fri, 30 Jun 2006 02:00:36 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5U20Zfx014117; Fri, 30 Jun 2006 02:00:35 GMT (envelope-from gnats) Resent-Date: Fri, 30 Jun 2006 02:00:35 GMT Resent-Message-Id: <200606300200.k5U20Zfx014117@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, Arseny Nasokin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86CA516A4A0 for ; Fri, 30 Jun 2006 01:55:27 +0000 (UTC) (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 5642243D48 for ; Fri, 30 Jun 2006 01:55:27 +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 k5U1tR69050041 for ; Fri, 30 Jun 2006 01:55:27 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k5U1tROa050040; Fri, 30 Jun 2006 01:55:27 GMT (envelope-from nobody) Message-Id: <200606300155.k5U1tROa050040@www.freebsd.org> Date: Fri, 30 Jun 2006 01:55:27 GMT From: Arseny Nasokin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/99627: [PATCH] make update & CVSROOT 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, 30 Jun 2006 02:00:37 -0000 >Number: 99627 >Category: misc >Synopsis: [PATCH] make update & CVSROOT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 30 02:00:35 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Arseny Nasokin >Release: FreeBSD 7.0-CURRENT >Organization: Moscow State University >Environment: affected many years. >Description: CVSROOT variable, defined by make(1), not in make(1) envirounment, is not used in update via CVS. >How-To-Repeat: !!! updating with CVS, not CVSUp !!! cd /usr/src && make update -DCVS_UPDATE CVSROOT='any-string' -------------------------------------------------------------- >Fix: There is patch for lastest Makefile.inc1 for CURRENT, but same patch is for othes branches. --- Makefile.inc1.orig Tue Jun 6 22:07:58 2006 +++ Makefile.inc1 Fri Jun 30 05:45:29 2006 @@ -79,6 +79,9 @@ .endif CVS?= cvs +.if defined(CVSROOT) && !empty(CVSROOT) +CVS:= ${CVS} -d ${CVSROOT} +.endif CVSFLAGS?= -A -P -d -I! SUP?= /usr/bin/csup SUPFLAGS?= -g -L 2 >Release-Note: >Audit-Trail: >Unformatted: >>> Updating /usr/src from CVS repository any-string -------------------------------------------------------------- cd /usr/src; cvs -R -q update -A -P -d -I! ..(normal cvs update output)