From owner-freebsd-current Mon Dec 2 1:57:38 2002 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 7D38F37B401; Mon, 2 Dec 2002 01:57:35 -0800 (PST) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83AD643ECD; Mon, 2 Dec 2002 01:57:22 -0800 (PST) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Sunbay) with ESMTP id gB29v3tV093471 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Mon, 2 Dec 2002 11:57:11 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Submit) id gB29v34I093466; Mon, 2 Dec 2002 11:57:03 +0200 (EET) Date: Mon, 2 Dec 2002 11:57:03 +0200 From: Ruslan Ermilov To: Doug Barton Cc: "Daniel C. Sobral" , current@FreeBSD.org, re@FreeBSD.org, Warner Losh , Peter Wemm Subject: Re: [REPORT] Upgrade from 4.0-RELEASE to 5.0-CURRENT Message-ID: <20021202095703.GC86324@sunbay.com> References: <20021201150303.GA6369@sunbay.com> <3DEA2774.DCE1CACD@newsguy.com> <20021202011423.Y7297-100000@master.gorean.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZwgA9U+XZDXt4+m+" Content-Disposition: inline In-Reply-To: <20021202011423.Y7297-100000@master.gorean.org> User-Agent: Mutt/1.5.1i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --ZwgA9U+XZDXt4+m+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 02, 2002 at 01:15:39AM -0800, Doug Barton wrote: > On Sun, 1 Dec 2002, Daniel C. Sobral wrote: >=20 > > IIRC, we never supported upgrade to 4.0 or 4.1 from anybut but the > > *latest* version in the 3.x series. I sure hope we adopt the same policy > > here. >=20 > While I can't put a lot of time into supporting ru's efforts, and I agree > that the policy should be that we only officially support updating from > the latest RELENG_4, I think his work is noble, and I think we all agree > that any effort in this direction is laudable. >=20 Having been actually working on this, I can say that the effort in supporting 4.0 -> 5.0 path is minimal, taking into consideration the following facts: 1. We're required to support 4.0-RELEASE -> RELENG_4 upgrades. 2. We're required to support RELENG_4 -> 5.0-RELEASE upgrades. 3. It's desirable to support upgrades within 5.0-CURRENT. 4. First day 5.0-CURRENT is identical to 4.0-RELEASE. In 95% (maybe more) of cases, when I commit something titled "Boostrapping aid for 4.0-RELEASE", it should be equally appicable to upgrades from 4.0 to RELENG_4. A few recent examples: : ru 2002/11/13 03:50:40 PST :=20 : Modified files: : usr.sbin/crunch/crunchide exec_elf32.c : gnu/usr.bin/cc/cc_tools auto-host.h : lib/libncurses Makefile : Log: : Bootstrapping aid for 4.0-RELEASE. :=20 : Revision Changes Path : 1.11 +3 -0 src/gnu/usr.bin/cc/cc_tools/auto-host.h : 1.64 +4 -0 src/lib/libncurses/Makefile : 1.6 +6 -0 src/usr.sbin/crunch/crunchide/exec_elf32.c When/if libncurses is MFC'ed, this change will be required to upgrade from 4.0-RELEASE. Similarly for crunchide(1). cc_tools is an exception -- we aren't likely to bring GCC 3.x to RELENG_4. OTOH, the change to auto-host.h is also of a help when upgrading from pre-stdbool.h 5.0-CURRENT systems: : /* Define if you have a working header file. */ : +#if (__FreeBSD_version >=3D 440003 && __FreeBSD_version < 500000) || \ : + __FreeBSD_version >=3D 500014 : #define HAVE_STDBOOL_H 1 : +#endif Another one: : ru 2002/12/01 05:38:25 PST :=20 : Modified files: : usr.bin/make job.c : Log: : Bootstrapping aid from pre-kqueue(2) systems, e.g. 4.0-RELEASE. :=20 : Submitted by: jmallett : Approved by: re (bmah) :=20 : Revision Changes Path : 1.48 +2 -0 src/usr.bin/make/job.c When/if this change is merged, it'll be needed to upgrade from 4.0 to RELENG_4. Quoting Marcel in his writing to me, On Sun, Jun 02, 2002 at 12:03:24PM -0700, Marcel Moolenaar wrote: > > Yes. I liked you reasoning in another mail where you said that -current > starts at the branch-point and that is what we need to support. The > additional advantage of this is that it has a stabilizing effect on > -stable. One will not easily MFC something if it breaks the upgrade path, > which means that there's a higher chance that if the MFC happens anyway, > more thought has gone into it. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --ZwgA9U+XZDXt4+m+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD4DBQE96y5vUkv4P6juNwoRAvHqAJwJti0oNUDips4sZ6gC7zhFr2TeGQCWMyk8 m6eNQtjcEipx1d0xyzljlg== =x+YA -----END PGP SIGNATURE----- --ZwgA9U+XZDXt4+m+-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message