Date: Tue, 29 May 2001 08:50:12 +0200 (SAT) From: John Hay <jhay@icomtek.csir.co.za> To: bmah@FreeBSD.ORG Cc: current@FreeBSD.ORG Subject: Re: make release failure Message-ID: <200105290650.f4T6oC221735@zibbi.icomtek.csir.co.za> In-Reply-To: <200105280632.f4S6W9J44708@bmah-freebsd-0.cisco.com> from "Bruce A. Mah" at "May 27, 2001 11:32:09 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
Yes, this patch fix it for me. I had to convert the spaces back to tabs
though. :-)
John
--
John Hay -- John.Hay@icomtek.csir.co.za
> 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
>
> #
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?200105290650.f4T6oC221735>