From owner-freebsd-current@FreeBSD.ORG Thu Dec 1 10:10:14 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95117106566B for ; Thu, 1 Dec 2011 10:10:14 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id 1923D8FC14 for ; Thu, 1 Dec 2011 10:10:13 +0000 (UTC) Received: by eekc13 with SMTP id c13so1508781eek.13 for ; Thu, 01 Dec 2011 02:10:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=923eEsipSqOBbec6OWYwdNX0+ekFNAv1SOkvkNtjG/Y=; b=tD5+mpffZRrA/1XZboDB5aQR5EpjIrYJ96MXuJDmRKYOJlnOo8qIHBWj3Kzg59QlKW zBRUrj8CoknMehEFDscwM5LNSGYx5zADcjgBpipHqZyCGLAbUI0WiFlcj+7ItcIFhmd0 0UqaT1ZkBTW6iIibTDWy4KFSRBZIMWl++1i08= MIME-Version: 1.0 Received: by 10.180.95.230 with SMTP id dn6mr4343802wib.41.1322734212838; Thu, 01 Dec 2011 02:10:12 -0800 (PST) Received: by 10.180.95.98 with HTTP; Thu, 1 Dec 2011 02:10:12 -0800 (PST) In-Reply-To: <20111201091721.GH50300@deviant.kiev.zoral.com.ua> References: <20111126084402.1afbfc16@atom.dino.sk> <20111201072040.7c76ba2d@atom.dino.sk> <20111201091721.GH50300@deviant.kiev.zoral.com.ua> Date: Thu, 1 Dec 2011 13:10:12 +0300 Message-ID: From: Sergey Kandaurov To: Kostik Belousov Content-Type: text/plain; charset=ISO-8859-1 Cc: Maxim Khitrov , freebsd-current@freebsd.org, Milan Obuch Subject: Re: Incorrect tag= in /usr/src/share/examples/cvsup/sta(ble|ndard) in 9.0-PRERELEASE? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 01 Dec 2011 10:10:14 -0000 On 1 December 2011 13:17, Kostik Belousov wrote: > On Thu, Dec 01, 2011 at 12:12:18PM +0300, Sergey Kandaurov wrote: >> On 1 December 2011 10:20, Milan Obuch wrote: >> > On Tue, 29 Nov 2011 19:22:39 +0300 >> > Sergey Kandaurov wrote: >> > >> >> On 29 November 2011 20:16, Maxim Khitrov wrote: >> >> > On Tue, Nov 29, 2011 at 10:30 AM, Sergey Kandaurov >> >> > wrote: >> >> >> On 26 November 2011 11:44, Milan Obuch >> >> >> wrote: >> >> >>> Hi, >> >> >>> >> >> >>> I am playing a bit with 9.0-PRERELEASE compiling it from source >> >> >>> updated via csup. In both example files there is line specifying >> >> >>> what to csup >> >> >>> >> >> >>> *default release=cvs tag=RELENG_8 >> >> >>> >> >> >>> which is incorrect, I think. It is convenient for me to issue just >> >> >>> >> >> >>> csup -h cvsup.freebsd.sk /usr/share/examples/cvsup/stable-supfile >> >> >>> >> >> >>> to update full sources without need to create any cvsup config >> >> >>> file, however in system installed from 9.0 snapshot (maybe two >> >> >>> weeks old) this file points to version 8 files, so I need to >> >> >>> correct it for 9.0-PRERELEASE to not accidentally download older >> >> >>> version sources. >> >> >>> >> >> >>> The same is also true after upgrade from source - make >> >> >>> installworld install example files pointing to older version... >> >> >>> >> >> >>> Is it something I do not know about or is it an oversight? I >> >> >>> think this line should already be changed to new tag... >> >> >>> >> >> >>> *default release=cvs tag=RELENG_9 >> >> >> >> >> >> Hi. >> >> >> >> >> >> Fixed. Thanks for your report. >> >> >> Now cvs tag points to RELENG_9 in 9.x sources. >> >> > >> >> > Should standard-supfile also be updated to point to RELENG_9_0? I'm >> >> > using csup with "tag=RELENG_9_0" and standard-supfile still points >> >> > to HEAD. >> >> >> >> Yep, sure. >> >> I just sent a request to the Release Engineering Team. >> >> >> > >> > It works for me now as expected, thanks. >> > >> > Anyway, there is a question what the difference between stable-supfile >> > and standard-supfile should be. I looked in my local csupped sources, >> > they are the same in 6-STABLE (OK, some history here), 7-STABLE, >> > 8-STABLE and 9-STABLE. Are they expected to be used differently? >> >> In STABLE branches standard-supfile and stable-supfile are used to have >> the same cvs tag. FYI, compare how it is done in RELEASE branches. >> >> > And, second one - what about CURRENT? In stable-supfile I see >> > tag=RELENG_9 which is not quite clear, but just for some pedantry... I >> > use standard-supfile for CURRENT, so this is not an issue for me either. >> >> To my knowledge, in CURRENT a standard-supfile's cvs tag should be >> read as "the latest (i.e. the most recently created) stable branch". > Could the supfiles be generated from some value in newvers.sh ? I have no idea how it could be done gracefully, sorry. But I like how it is done in www/. Here are several defined entities used elsewhere in doc&www. and so on. -- wbr, pluknet