From owner-cvs-all@FreeBSD.ORG Thu Jan 15 05:39:07 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8F6C16A4CE; Thu, 15 Jan 2004 05:39:07 -0800 (PST) Received: from phantom.cris.net (phantom.cris.net [212.110.130.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id D229043D45; Thu, 15 Jan 2004 05:39:01 -0800 (PST) (envelope-from ru@FreeBSD.org.ua) Received: from phantom.cris.net (ru@localhost [127.0.0.1]) by phantom.cris.net (8.12.10/8.12.10) with ESMTP id i0FDdVCa082305; Thu, 15 Jan 2004 15:39:31 +0200 (EET) (envelope-from ru@FreeBSD.org.ua) Received: (from ru@localhost) by phantom.cris.net (8.12.10/8.12.10/Submit) id i0FDdPri082296; Thu, 15 Jan 2004 15:39:25 +0200 (EET) (envelope-from ru) Date: Thu, 15 Jan 2004 15:39:25 +0200 From: Ruslan Ermilov To: Makoto Matsushita Message-ID: <20040115133925.GA82211@FreeBSD.org.ua> References: <20040114185923.GC73318@FreeBSD.org.ua> <20040115111124W.matusita@jp.FreeBSD.org> <20040115083715.GA79312@FreeBSD.org.ua> <20040115195935S.matusita@jp.FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="AhhlLboLdkugWU4S" Content-Disposition: inline In-Reply-To: <20040115195935S.matusita@jp.FreeBSD.org> User-Agent: Mutt/1.5.5.1i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: nyan@FreeBSD.org Subject: Re: cvs commit: src/release Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2004 13:39:08 -0000 --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 15, 2004 at 07:59:35PM +0900, Makoto Matsushita wrote: >=20 > ru> It's possible to have a RELENG_4 box (with RELENG_4 /usr/src and > ru> /usr/obj matching the running version), and build a release > ru> snapshot of HEAD. >=20 > Hmm, I've just got what you meant, sorry. How about this patch?: >=20 > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/ncvs/src/release/Makefile,v > retrieving revision 1.829 > diff -u -r1.829 Makefile > --- Makefile 15 Jan 2004 10:17:43 -0000 1.829 > +++ Makefile 15 Jan 2004 10:57:54 -0000 > @@ -459,7 +459,11 @@ > # NB: these may fail if the host is running w/o devfs > echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} > echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} > - echo "/etc/rc.d/ldconfig start" >> ${_MK} > + echo "if [ -f /etc/rc.d/ldconfig ]; then" >> ${_MK} >=20 -x would be better. > + echo " /etc/rc.d/ldconfig start" >> ${_MK} > + echo "else" >> ${_MK} > + echo " ldconfig /lib /usr/lib /usr/local/lib" >> ${_MK} >=20 Add ``|| true''. The /lib may not exist, and while it's only a warning in the current version of ldconfig(8), you cannot be sure that the exit status will always be 0. > + echo "fi" >> ${_MK} > echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} > echo " cd /usr/src" >> ${_MK} > echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} >=20 Otherwise looks OK. > Or simply backout the delta that introduced to use a rcng script? >=20 Um, why? This shouldn't stop the progress. ;) Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --AhhlLboLdkugWU4S Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFABpgNUkv4P6juNwoRAn/gAJ9nz24WbpponTWlAERA2UKeU+S4EACeJkeV Fra7QzwwP52pEbuRPge03ww= =z4yV -----END PGP SIGNATURE----- --AhhlLboLdkugWU4S--