cvs commit: src/release Makefile

[Ruslan Ermilov]

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.


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru at FreeBSD.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20040129/9c670869/attachment-0001.bin