Date: Wed, 30 May 2001 18:43:14 +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: <200105301643.f4UGhEh70692@zibbi.icomtek.csir.co.za> In-Reply-To: <200105291707.f4TH78M59913@bmah-freebsd-0.cisco.com> from "Bruce A. Mah" at "May 29, 2001 10:07:08 am"
next in thread | previous in thread | raw e-mail | index | archive | help
Bruce,
> > Yes, this patch fix it for me. I had to convert the spaces back to tabs
> > though. :-)
>
> Hi John--
>
> I was trying to test out another patch, which (in addition to fixing
> the problem you found) also folds the functionality of NORELNOTES into
> NODOC. Unfortunately, my -CURRENT test box is having some difficulties
> (probably VM-related) and it's going to take a little while before I
> can do a "make release" again to do any testing. :-(
>
> I'll see what I can do about getting my first patch committed to at
> least unbreak "make release".
>
I have now also tested your second patch and with a minor mod to make
make happy, the release finished. Here is the patch as I have used it.
John
--
John Hay -- John.Hay@icomtek.csir.co.za
Index: release/Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.619
diff -u -r1.619 Makefile
--- release/Makefile 2001/05/29 17:14:59 1.619
+++ release/Makefile 2001/05/30 07:10:28
@@ -69,15 +69,11 @@
# CPU cycles (some of the programs are C++, and things like ghostscript
# belong to the required ports nevertheless).
#
-# Setting this also disables doc.2 (RELNOTESng).
+# Setting this also disables building of release note documentation
+# (RELNOTESng).
#NODOC= YES
#NOPORTS= YES
-# RELNOTESng can be disabled by uncommenting the following variable
-# definition. RELNOTESng depends on having ports enabled for this
-# release build.
-#NORELNOTES= YES
-
# Uncomment and modify this definition if you want the release notes
# and other release documentation in a language other than English.
#RELNOTES_LANG= en_US.ISO_8859-1
@@ -109,7 +105,7 @@
# on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
AUTO_KEYBOARD_DETECT?= 0
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
DIST_DOCS_ARCH_INDEP= readme errata
DIST_DOCS_ARCH_DEP= installation relnotes hardware
.endif
@@ -219,11 +215,8 @@
.endif
.if !defined(NODOC)
-DOCREL= doc.1
-.if !defined(NORELNOTES)
-DOCREL+= doc.2
+DOCREL= doc.1 doc.2
.endif
-.endif
.if !defined(NOPORTREADMES)
MAKEREADMES= make readmes PORTSDIR=${CHROOTDIR}/usr/ports
@@ -240,11 +233,6 @@
@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
@exit 1
.endif
-.if !defined(NORELNOTES) && defined(NODOC)
- @echo "Docs are required for building the release notes. Either"
- @echo "set NORELNOTES or unset NODOC!"
- @exit 1
-.endif
.if make(release)
.if exists(${CHROOTDIR})
# The first command will fail on a handful of files that have their schg
@@ -357,9 +345,6 @@
.if defined(NOSRC)
echo "export NOSRC=${NOSRC}" >> ${CHROOTDIR}/mk
.endif
-.if defined(NORELNOTES)
- echo "export NORELNOTES=${NORELNOTES}" >> ${CHROOTDIR}/mk
-.endif
.if defined(RELNOTES_LANG)
echo "export RELNOTES_LANG=${RELNOTES_LANG}" >> ${CHROOTDIR}/mk
.else
@@ -617,7 +602,7 @@
ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
done
@@ -712,7 +697,7 @@
-@ln -s . ${FD}/${BUILDNAME}
@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
@@ -751,7 +736,7 @@
@cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
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?200105301643.f4UGhEh70692>