cvs commit: src/release Makefile

[John Baldwin]

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 <jhb at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org