Date: Thu, 29 Jan 2004 17:45:27 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Takahashi Yoshihiro <nyan@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile Message-ID: <20040129154527.GN19899@FreeBSD.org.ua> In-Reply-To: <200401291514.i0TFExFH081348@repoman.freebsd.org> References: <200401291514.i0TFExFH081348@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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@FreeBSD.org
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFAGSqXUkv4P6juNwoRAqTtAJ9TsdnVLL/qnekjbZVhwWp1j4VMcACdHwtZ
QgjKVjMZ0esOUWY07WBvaSQ=
=CfbQ
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040129154527.GN19899>