From owner-cvs-all@FreeBSD.ORG Thu Jan 29 07:59:20 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 CB7C816A4D1 for ; Thu, 29 Jan 2004 07:59:20 -0800 (PST) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2AAA43D1F for ; Thu, 29 Jan 2004 07:59:07 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 8563 invoked from network); 29 Jan 2004 15:59:06 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 29 Jan 2004 15:59:06 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i0TFwIMA069201; Thu, 29 Jan 2004 10:58:54 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Ruslan Ermilov , Takahashi Yoshihiro Date: Thu, 29 Jan 2004 10:58:33 -0500 User-Agent: KMail/1.5.4 References: <200401291514.i0TFExFH081348@repoman.freebsd.org> <20040129154527.GN19899@FreeBSD.org.ua> In-Reply-To: <20040129154527.GN19899@FreeBSD.org.ua> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200401291058.34002.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) 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:59:21 -0000 On Thursday 29 January 2004 10:45 am, Ruslan Ermilov wrote: > On Thu, Jan 29, 2004 at 07:14:59AM -0800, Takahashi Yoshihiro wrote: > > nyan 2004/01/29 07:14:59 PST > > > > FreeBSD src repository > > > > Modified files: > > release Makefile > > Log: > > The name of small boot floppy should be boot-small.flp to avoid > > conflicting normal size floppy. > > > > Reviewed by: jhb > > > > Revision Changes Path > > 1.838 +2 -2 src/release/Makefile > > Thanks! This fix is also part of the larger patch I sent to John: > > %%% > Index: Makefile > =================================================================== > 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 > > -.if !defined(NOFLOPPIES) > +.if !defined(NO_FLOPPIES) > EXTRAS= floppies.1 floppies.2 floppies.3 > .endif > EXTRAS+= ftp.1 > @@ -758,7 +758,7 @@ > KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \ > MFSROOTFILE="${MFSROOTFLOPPYSET}.split ${MFSROOTFLOPPYSET}.boot" > .if defined(SMALLFLOPPYSIZE) > - @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \ > + @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \ > KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \ > MFSROOTFILE="${SMALLMFSROOTFLOPPYSET}.split > ${SMALLMFSROOTFLOPPYSET}.boot" \ FDSIZE="SMALL" > @@ -768,7 +768,7 @@ > KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \ > MFSROOTFILE=${RD}/mfsroot/mfsroot.gz > .if defined(SMALLFLOPPYSIZE) > - @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \ > + @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \ > KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \ > MFSROOTFILE=${RD}/mfsroot/mfsroot.gz \ > FDSIZE="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=${SPLITDIR}/`basename ${SPLITFILE}`.split ; \ > lines=`cat $${splitfile} | wc -l`; \ > %%% > > This should also fix snapshot builds for architectures without > floppies. Hmm, I don't recall ever seeing this patch, but it looks ok. Note that lots of ther scripts don't explicitly use sh, but I guess cvs doesn't preserve the execute permissions, so it's probably best to just do that anyways. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org