cvs commit: src/release Makefile

[Ruslan Ermilov]

On Mon, Aug 16, 2004 at 08:28:58AM +0000, David E. O'Brien wrote:
> obrien      2004-08-16 08:28:58 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     release              Makefile 
>   Log:
>   Accept the fact that floppies either aren't applicable or relevant on most
>   platforms.  So make the floppy logic easier to read.
>   
>   Revision  Changes    Path
>   1.851     +7 -8      src/release/Makefile
> 
FWIW, I like your change in principle.

May I ask that you please rename it to MAKE_FLOPPIES, so it's
even more easier to follow?  ;)

Also, the new version is not as safe as the old one -- by
accidentally setting FLOPPIES (or whatever it ends up
being called if you agree to my suggestion) in environment
you risk attempting to build floppies on architectures that
don't support it, hence the .undef in the patch below.

The patch also restores the correct ordering in the export
list which broke after a rename.

The release(7) manpage was not updated either.  ;)

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.851
diff -u -p -r1.851 Makefile
--- Makefile	16 Aug 2004 08:28:58 -0000	1.851
+++ Makefile	16 Aug 2004 08:45:55 -0000
@@ -168,8 +168,9 @@ MNT=			/mnt
 # Various floppy image parameters.
 #
 
+.undef MAKE_FLOPPIES
 .if ${TARGET_ARCH} == "i386"
-FLOPPIES=		true
+MAKE_FLOPPIES=		true
 .if ${TARGET} == "pc98"
 SMALLFLOPPYSIZE=	1200
 SMALLFLOPPYSPLITSIZE=	1152
@@ -185,7 +186,7 @@ MFSSIZE=		4320
 MFSINODE=		8000
 MFSLABEL=		minimum3
 .elif ${TARGET_ARCH} == "alpha"
-FLOPPIES=		true
+MAKE_FLOPPIES=		true
 FLOPPYSIZE=		1440
 FLOPPYSPLITSIZE=	1392
 FLOPPYINODE=		40000
@@ -250,7 +251,7 @@ CRUNCH_TARGETS+=fixit-small
 .endif
 .endif
 
-.if defined(FLOPPIES)
+.if defined(MAKE_FLOPPIES)
 EXTRAS= floppies.1
 .if ${TARGET_ARCH} == "i386"
 EXTRAS+= floppies.2
@@ -438,6 +439,7 @@ release rerelease:
 	HTTP_PROXY \
 	KERNELS \
 	KERNEL_FLAGS \
+	MAKE_FLOPPIES \
 	MAKE_ISOS \
 	NOCDROM \
 	NODOC \
@@ -446,7 +448,6 @@ release rerelease:
 	NOSRC \
 	NO_CPU_CFLAGS \
 	NO_CPU_COPTFLAGS \
-	FLOPPIES \
 	NO_SENDMAIL \
 	RELEASETAG \
 	RELNOTES_LANG \
@@ -512,7 +513,7 @@ release.1:
 	-chflags -R noschg ${_R}/.
 	rm -rf ${_R}/*
 	mkdir ${RD}
-.if defined(FLOPPIES)
+.if defined(MAKE_FLOPPIES)
 	mkdir ${RD}/floppies
 .endif
 	mkdir ${RD}/trees
@@ -824,7 +825,7 @@ ftp.1:
 	@echo "Setting up FTP distribution area"
 	@mkdir -p ${FD}
 	- at ln -s . ${FD}/${BUILDNAME}
-.if defined(FLOPPIES)
+.if defined(MAKE_FLOPPIES)
 	@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
 .endif
 	@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
@@ -857,7 +858,7 @@ cdrom.1:
 	@echo "Setting up CDROM distribution area"
 	@mkdir -p ${CD_BOOT} ${CD_DISC1} ${CD_DISC2}
 	- at ln -s . ${CD_DISC1}/${BUILDNAME}
-.if defined(FLOPPIES)
+.if defined(MAKE_FLOPPIES)
 	@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1}
 .endif
 	@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DISC1}
%%%


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- 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/20040816/f7efb780/attachment.bin