From owner-freebsd-current@FreeBSD.ORG Tue Jul 22 11:50:15 2003 Return-Path: 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 7F27037B401; Tue, 22 Jul 2003 11:50:15 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 284C543F3F; Tue, 22 Jul 2003 11:50:09 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h6MIo50U082698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Jul 2003 21:50:05 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h6MIo58R082697; Tue, 22 Jul 2003 21:50:05 +0300 (EEST) (envelope-from ru) Date: Tue, 22 Jul 2003 21:50:05 +0300 From: Ruslan Ermilov To: John Baldwin Message-ID: <20030722185005.GC80514@sunbay.com> References: <20030722183730.GA80514@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="H8ygTp4AXg6deix2" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.4i cc: current@FreeBSD.org Subject: Re: make release broken [FIX] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 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: Tue, 22 Jul 2003 18:50:15 -0000 --H8ygTp4AXg6deix2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 22, 2003 at 02:45:52PM -0400, John Baldwin wrote: >=20 > On 22-Jul-2003 Ruslan Ermilov wrote: > > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote: > >>=20 > >> On 22-Jul-2003 Ruslan Ermilov wrote: > >> > Hi! > >> >=20 > >> > As many of you probably know, recent telnet commit broke snapshot > >> > building. Since I needed a working "make release" to go on with > >> > my task on floppy-less "make release" (for AMD64, etc.), I had to > >> > just fix it. Attached is the patch. It also fixes another issue > >> > with this telnet commit: it ensures that crypto telnet[d] do not > >> > end up in the "base" distribution. > >>=20 > >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want > >> floppies? > >>=20 > > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not > > create floppy _images_", and we want to skip much more than that. > > I have a preliminary patch that is currently under the "make > > release" test. Let me know (or anyone else) if you want to review > > it or the final version before I commit it. >=20 > Are you eliminating the mfsroot? >=20 Yes. > All the bootable CD's use > that right now, so what more are you doing than eliminating > the floppy images? >=20 Part of the patch for the iso.1 target has this (cut-n-pasted): @@ -885,10 +873,7 @@ .if ${TARGET} !=3D "pc98" @echo "Setting up /boot" @rm -f ${CD_DISC2}/boot/loader.conf - @cp ${RD}/mfsroot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz - @echo 'mfsroot_load=3D"YES"' > ${CD_DISC2}/boot/loader.conf - @echo 'mfsroot_type=3D"mfs_root"' >> ${CD_DISC2}/boot/loader.conf - @echo 'mfsroot_name=3D"/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.c= onf + @echo 'init_path=3D"/usr/sbin/sysinstall"' > ${CD_DISC2}/boot/loade= r.conf @cp -Rp ${CD_DISC2}/boot ${CD_DISC1} .endif .if !defined(NOPORTS) Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --H8ygTp4AXg6deix2 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/HYddUkv4P6juNwoRAoprAJ9oNh0pdU9HYvsZ/hnie108gzs63wCgjMk3 mCutx2rr8rgbeqgoVw1cqwM= =XtDW -----END PGP SIGNATURE----- --H8ygTp4AXg6deix2--