Date: Sun, 27 May 2001 23:32:09 -0700 From: "Bruce A. Mah" <bmah@FreeBSD.ORG> To: Dima Dorfman <dima@unixfreak.org> Cc: John Hay <jhay@icomtek.csir.co.za>, current@FreeBSD.ORG, bmah@FreeBSD.ORG Subject: Re: make release failure Message-ID: <200105280632.f4S6W9J44708@bmah-freebsd-0.cisco.com> In-Reply-To: <20010528040536.43A833E28@bazooka.unixfreak.org> References: <20010528040536.43A833E28@bazooka.unixfreak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--==_Exmh_2070157235P
Content-Type: text/plain; charset=us-ascii
If memory serves me right, Dima Dorfman wrote:
> John Hay <jhay@icomtek.csir.co.za> writes:
> > > > *** Filesystem is 1440 K, 66 left
> > > > *** 4000 bytes/inode, 116 left
> > > > cp: /usr/src/release/texts/FLOPPIES.TXT: No such file or directory
> > >
> > > What revision of src/release/Makefile do you have? You want 1.618.
> >
> > beast# fgrep '$FreeBSD' /usr/src/release/Makefile
> > # $FreeBSD: src/release/Makefile,v 1.618 2001/05/25 18:01:31 bmah Exp $
> > beast# fgrep 'texts/FLOPPIES.TXT' /usr/src/release/Makefile
> > @cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT
Mea culpa. Mea maxima culpa. :-(
> Could you please try the attached, untested patch? I don't know
> enough about the release build process to know if it should work, but
> I guess it's worth a shot. Bruce Mah (cc'd) should know whether it's
> the Right(tm) fix.
Just got back from a road trip...my brain is a little fried now.
dd is going in the right direction, but the Makefile needs to consider
if NORELNOTES is defined or not. I recommend something like the
patch appended below...also untested...I'll test this tomorrow
when I am more awake, and maybe by then I will have figured out why
this slipped through my testing.
Sorry folks...
Bruce.
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.618
diff -u -r1.618 Makefile
--- Makefile 2001/05/25 18:01:31 1.618
+++ Makefile 2001/05/28 06:29:31
@@ -694,8 +694,13 @@
@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
# Do our last minute floppies directory setup in a convenient place.
- @cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT
+.if !defined(NORELNOTES)
+ @cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/article.txt \
+ ${RD}/floppies/README.TXT
@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
+.else
+ @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
+.endif
touch release.9
#
--==_Exmh_2070157235P
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.5 (FreeBSD)
Comment: Exmh version 2.3.1+ 05/14/2001
iD8DBQE7EfDp2MoxcVugUsMRAu3xAJ0aMAngxEHi0YAWI0LwZOYnSYFVegCdGrHU
D0FPn1ve3yNPVO72RMlVlKc=
=kxu6
-----END PGP SIGNATURE-----
--==_Exmh_2070157235P--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105280632.f4S6W9J44708>