From owner-cvs-all@FreeBSD.ORG Thu Jan 29 07:45:26 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 29C7716A4CE; Thu, 29 Jan 2004 07:45:26 -0800 (PST) Received: from phantom.cris.net (phantom.cris.net [212.110.130.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 313FB43D41; Thu, 29 Jan 2004 07:45:11 -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 i0TFjVem022187; Thu, 29 Jan 2004 17:45:35 +0200 (EET) (envelope-from ru@FreeBSD.org.ua) Received: (from ru@localhost) by phantom.cris.net (8.12.10/8.12.10/Submit) id i0TFjTSX022182; Thu, 29 Jan 2004 17:45:29 +0200 (EET) (envelope-from ru) Date: Thu, 29 Jan 2004 17:45:27 +0200 From: Ruslan Ermilov To: Takahashi Yoshihiro Message-ID: <20040129154527.GN19899@FreeBSD.org.ua> References: <200401291514.i0TFExFH081348@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="FilwpOHBrTVNlmJ3" Content-Disposition: inline In-Reply-To: <200401291514.i0TFExFH081348@repoman.freebsd.org> User-Agent: Mutt/1.5.5.1i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@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, 29 Jan 2004 15:45:26 -0000 --FilwpOHBrTVNlmJ3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 29, 2004 at 07:14:59AM -0800, Takahashi Yoshihiro wrote: > nyan 2004/01/29 07:14:59 PST >=20 > FreeBSD src repository >=20 > Modified files: > release Makefile=20 > Log: > The name of small boot floppy should be boot-small.flp to avoid conflic= ting > normal size floppy. > =20 > Reviewed by: jhb > =20 > Revision Changes Path > 1.838 +2 -2 src/release/Makefile > =20 Thanks! This fix is also part of the larger patch I sent to John: %%% 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.837 diff -u -r1.837 Makefile --- Makefile 28 Jan 2004 09:19:16 -0000 1.837 +++ Makefile 28 Jan 2004 23:35:51 -0000 @@ -245,7 +245,7 @@ .endif .endif =20 -.if !defined(NOFLOPPIES) +.if !defined(NO_FLOPPIES) EXTRAS=3D floppies.1 floppies.2 floppies.3 .endif EXTRAS+=3D ftp.1 @@ -758,7 +758,7 @@ KERNFILE=3D"${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \ MFSROOTFILE=3D"${MFSROOTFLOPPYSET}.split ${MFSROOTFLOPPYSET}.boot" .if defined(SMALLFLOPPYSIZE) - @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE=3D"boot" \ + @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE=3D"boot-small" \ KERNFILE=3D"${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \ MFSROOTFILE=3D"${SMALLMFSROOTFLOPPYSET}.split ${SMALLMFSROOTFLOPPYSET= }.boot" \ FDSIZE=3D"SMALL" @@ -768,7 +768,7 @@ KERNFILE=3D"${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \ MFSROOTFILE=3D${RD}/mfsroot/mfsroot.gz .if defined(SMALLFLOPPYSIZE) - @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE=3D"boot" \ + @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE=3D"boot-small" \ KERNFILE=3D"${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \ MFSROOTFILE=3D${RD}/mfsroot/mfsroot.gz \ FDSIZE=3D"SMALL" @@ -1082,7 +1082,7 @@ .if !defined(SPLITFILE) @echo "SPLITFILE undefined in ${.TARGET}" && exit 1 .endif - ${.CURDIR}/scripts/split-file.sh ${SPLITFILE} \ + sh ${.CURDIR}/scripts/split-file.sh ${SPLITFILE} \ ${RD}/floppyset/${FLOPPYBASE} ${FLPSPLITSIZE} "${FLOPPYDESC}" ( splitfile=3D${SPLITDIR}/`basename ${SPLITFILE}`.split ; \ lines=3D`cat $${splitfile} | wc -l`; \ %%% This should also fix snapshot builds for architectures without floppies. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --FilwpOHBrTVNlmJ3 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAGSqXUkv4P6juNwoRAqTtAJ9TsdnVLL/qnekjbZVhwWp1j4VMcACdHwtZ QgjKVjMZ0esOUWY07WBvaSQ= =CfbQ -----END PGP SIGNATURE----- --FilwpOHBrTVNlmJ3--