From owner-freebsd-current Fri Jan 21 5:21:33 2000 Delivered-To: freebsd-current@freebsd.org Received: from lamb.sas.com (lamb.sas.com [192.35.83.8]) by hub.freebsd.org (Postfix) with ESMTP id BA53914E88 for ; Fri, 21 Jan 2000 05:21:29 -0800 (PST) (envelope-from jwd@unx.sas.com) Received: from mozart (mozart.unx.sas.com [192.58.184.28]) by lamb.sas.com (8.9.3/8.9.1) with SMTP id IAA14392 for ; Fri, 21 Jan 2000 08:21:28 -0500 (EST) Received: from bb01f39.unx.sas.com by mozart (5.65c/SAS/Domains/5-6-90) id AA09544; Fri, 21 Jan 2000 08:20:58 -0500 Received: (from jwd@localhost) by bb01f39.unx.sas.com (8.9.3/8.9.1) id IAA64454 for freebsd-current@freebsd.org; Fri, 21 Jan 2000 08:20:54 -0500 (EST) (envelope-from jwd) From: "John W. DeBoskey" Message-Id: <200001211320.IAA64454@bb01f39.unx.sas.com> Subject: make release failure (HARDWARE.TXT) To: freebsd-current@freebsd.org Date: Fri, 21 Jan 2000 08:20:54 -0500 (EST) X-Mailer: ELM [version 2.4ME+ PL61 (25)] Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi, I've seen the following error for the last 2 days since the make release change to HARDWARE.TXT. CVS shows this file as removed from the head of the tree at revision 1.30 but the Makefile is unconditionally attempting to copy them in the ftp.1 & cdrom.1 targets, followed by optionally concatinating the ${MACHINE_ARCH} specific file. It appears that DIST_DOCS needs to be broken up into common doc or the for loops over DIST_DOCS needs to become smarter. I have supplied a patch which I beleive fixes the problem by allowing files misssing to be ignored. This of course means accidental errors in DOC file removal or location movement become harder to detect until someone actually checks the doc and sees that portions are missing. The patch and actual error condition follow. Thanks! John FreeBSD(root)/snap/release/usr/src/release %cvs diff -u Makefile Index: Makefile =================================================================== RCS file: /mirror/ncvs/src/release/Makefile,v retrieving revision 1.527 diff -u -r1.527 Makefile --- Makefile 2000/01/19 22:48:50 1.527 +++ Makefile 2000/01/21 13:25:01 @@ -527,7 +527,11 @@ @cd ${RD} && find floppies -print | cpio -dumpl ${FD} @cd ${RD}/dists && find . -print | cpio -dumpl ${FD} @for i in ${DIST_DOCS}; do \ - cp ${.CURDIR}/texts/$${i} ${FD}; \ + if [ -f ${.CURDIR}/texts/$${i} ]; then \ + cp ${.CURDIR}/texts/$${i} ${FD}; \ + else \ + echo "=== No common ${i} documentation" > ${FD}/$${i}; \ + fi; \ if [ -f ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} ]; then \ echo "=== Platform specifics for ${MACHINE_ARCH}" >> ${FD}/$${i}; \ cat ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} >> ${FD}/$${i}; \ @@ -560,7 +564,11 @@ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf @for i in ${DIST_DOCS}; do \ - cp ${.CURDIR}/texts/$${i} ${CD_DISC1}; \ + if [ -f ${.CURDIR}/texts/$${i} ]; then \ + cp ${.CURDIR}/texts/$${i} ${CD_DISC1}; \ + else \ + echo "=== No common ${i} documentation" > ${FD}/$${i}; \ + fi; \ if [ -f ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} ]; then \ echo "=== Platform specifics for ${MACHINE_ARCH}" >> ${FD}/$${i}; \ cat ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} >> ${CD_DISC1}/$${i}; \ touch release.9 0 blocks Setting up CDROM distribution area 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks 0 blocks cp: /usr/src/release/texts/HARDWARE.TXT: No such file or directory *** Error code 1 Stop in /usr/src/release. *** Error code 1 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message