Date: Mon, 16 Aug 2004 11:47:11 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: "David E. O'Brien" <obrien@freebsd.org> Cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/release Makefile Message-ID: <20040816084711.GA3205@ip.net.ua> In-Reply-To: <200408160828.i7G8SwGn067849@repoman.freebsd.org> References: <200408160828.i7G8SwGn067849@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Aug 16, 2004 at 08:28:58AM +0000, David E. O'Brien wrote:
> obrien 2004-08-16 08:28:58 UTC
>=20
> FreeBSD src repository
>=20
> Modified files:
> release Makefile=20
> Log:
> Accept the fact that floppies either aren't applicable or relevant on m=
ost
> platforms. So make the floppy logic easier to read.
> =20
> Revision Changes Path
> 1.851 +7 -8 src/release/Makefile
>=20
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D /mnt
# Various floppy image parameters.
#
=20
+.undef MAKE_FLOPPIES
.if ${TARGET_ARCH} =3D=3D "i386"
-FLOPPIES=3D true
+MAKE_FLOPPIES=3D true
.if ${TARGET} =3D=3D "pc98"
SMALLFLOPPYSIZE=3D 1200
SMALLFLOPPYSPLITSIZE=3D 1152
@@ -185,7 +186,7 @@ MFSSIZE=3D 4320
MFSINODE=3D 8000
MFSLABEL=3D minimum3
.elif ${TARGET_ARCH} =3D=3D "alpha"
-FLOPPIES=3D true
+MAKE_FLOPPIES=3D true
FLOPPYSIZE=3D 1440
FLOPPYSPLITSIZE=3D 1392
FLOPPYINODE=3D 40000
@@ -250,7 +251,7 @@ CRUNCH_TARGETS+=3Dfixit-small
.endif
.endif
=20
-.if defined(FLOPPIES)
+.if defined(MAKE_FLOPPIES)
EXTRAS=3D floppies.1
.if ${TARGET_ARCH} =3D=3D "i386"
EXTRAS+=3D 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}
-@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}
-@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,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--5mCyUwZo2JvN/JJP
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFBIHSPqRfpzJluFF4RAthhAJ939GQaeX2bmy+zNZMAK3eXJQ371gCeLC/K
M5QRWkhzPPdwWk0q7vOxQQg=
=a1CX
-----END PGP SIGNATURE-----
--5mCyUwZo2JvN/JJP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040816084711.GA3205>