From owner-freebsd-current@FreeBSD.ORG Thu Dec 1 09:17:31 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 B04DB106564A for ; Thu, 1 Dec 2011 09:17:31 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 493D08FC13 for ; Thu, 1 Dec 2011 09:17:30 +0000 (UTC) Received: from alf.home (alf.kiev.zoral.com.ua [10.1.1.177]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id pB19HLpN063621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Dec 2011 11:17:22 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from alf.home (kostik@localhost [127.0.0.1]) by alf.home (8.14.5/8.14.5) with ESMTP id pB19HLls082269; Thu, 1 Dec 2011 11:17:21 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by alf.home (8.14.5/8.14.5/Submit) id pB19HL2q082268; Thu, 1 Dec 2011 11:17:21 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: alf.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 1 Dec 2011 11:17:21 +0200 From: Kostik Belousov To: Sergey Kandaurov Message-ID: <20111201091721.GH50300@deviant.kiev.zoral.com.ua> References: <20111126084402.1afbfc16@atom.dino.sk> <20111201072040.7c76ba2d@atom.dino.sk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="cxhlVrkHblhtPc7U" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua 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 09:17:31 -0000 --cxhlVrkHblhtPc7U Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=3Dcvs tag=3DRELENG_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=3Dcvs tag=3DRELENG_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=3DRELENG_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? >=20 > 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. >=20 > > And, second one - what about CURRENT? In stable-supfile I see > > tag=3DRELENG_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. >=20 > 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 ? --cxhlVrkHblhtPc7U Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk7XRiEACgkQC3+MBN1Mb4h6rgCfV5BMEGAATpOltIPjLysWELJx iNQAoIsbTCuEH/I5xJfAHE82pznIkmfQ =nr9V -----END PGP SIGNATURE----- --cxhlVrkHblhtPc7U--