From owner-freebsd-current Sun May 27 23:35:34 2001 Delivered-To: freebsd-current@freebsd.org Received: from sj-msg-core-2.cisco.com (sj-msg-core-2.cisco.com [171.69.24.11]) by hub.freebsd.org (Postfix) with ESMTP id 658B537B506; Sun, 27 May 2001 23:35:23 -0700 (PDT) (envelope-from bmah@cisco.com) Received: from bmah-freebsd-0.cisco.com (bmah-freebsd-0.cisco.com [171.70.84.42]) by sj-msg-core-2.cisco.com (8.11.3/8.9.1) with ESMTP id f4S6X2U26561; Sun, 27 May 2001 23:33:11 -0700 (PDT) Received: (from bmah@localhost) by bmah-freebsd-0.cisco.com (8.11.3/8.11.3) id f4S6W9J44708; Sun, 27 May 2001 23:32:09 -0700 (PDT) (envelope-from bmah) Message-Id: <200105280632.f4S6W9J44708@bmah-freebsd-0.cisco.com> X-Mailer: exmh version 2.4 05/15/2001 with nmh-1.0.4 To: Dima Dorfman Cc: John Hay , current@FreeBSD.ORG, bmah@FreeBSD.ORG Subject: Re: make release failure In-Reply-To: <20010528040536.43A833E28@bazooka.unixfreak.org> References: <20010528040536.43A833E28@bazooka.unixfreak.org> Comments: In-reply-to Dima Dorfman message dated "Sun, 27 May 2001 21:05:36 -0700." From: "Bruce A. Mah" Reply-To: bmah@FreeBSD.ORG X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A 2V%N&+ X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif X-Url: http://www.employees.org/~bmah/ Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_2070157235P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Sun, 27 May 2001 23:32:09 -0700 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --==_Exmh_2070157235P Content-Type: text/plain; charset=us-ascii If memory serves me right, Dima Dorfman wrote: > John Hay 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