Date: 10 Nov 2000 04:41:18 -0800 From: asami@freebsd.org (Satoshi - Ports Wraith - Asami) To: Jordan Hubbard <jkh@winston.osd.bsdi.com> Cc: nik@freebsd.org, stable@freebsd.org Subject: Re: OK, I figured out why docs aren't building in the release candidates Message-ID: <vqcvgtwknip.fsf@silvia.hip.berkeley.edu> In-Reply-To: <22869.973846140@winston.osd.bsdi.com> (Jordan Hubbard's message of "Fri, 10 Nov 2000 00:49:00 -0800") References: <vqc1ywkg19f.fsf@silvia.hip.berkeley.edu> <22869.973846140@winston.osd.bsdi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
* From: Jordan Hubbard <jkh@winston.osd.bsdi.com>
* No, I meant general aspects of the ports collection were broken enough
* to stop the "make readmes" from working, not that the doc ports
* specifically were broken. That's why I can't use -current ports.
Hey, I fixed that already.
* > Um, you are not supposed to set it to the release tag until all parts
* > of the trees are tagged. ;-)
*
* I'm not - it's auto-setting itself and getting it wrong, see below.
This is what you said:
> If I leave AUXRELEASETAG unset and build the release with
> RELEASETAG=RELENG_4, as I must for all BETAs and interim release
> candidate snapshots for which I have no tags, then -current ports and
> doc is used. Unfortunately, the -current ports collection has been
> falling over for me if I use it, so I set AUXRELEASETAG=RELEASE_4_2_0
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> manually and the ports collection checks out a nice working version.
> Unfortunate, this then means that doc checks out on a non-existant tag
> and the directory is empty. Phoo!
You are not supposed to do that. AUXRELEASETAG was intended to only
be used (automatically) when RELEASETAG is a real release
("RELENG_ver_RELEASE").
The readmes problem (basically an .error in Makefile) is fixed a long
time ago (and I told you that), you should just have tried again
without AUXRELEASETAG.
* > Yes, separating it into two (both defaulting to the same value, of
* > course) is a good idea and will make the tags even more useful. Do
* > you have a patch for this, or do you want me to cook up one?
*
* Well, it's just a few lines.. I'm happy either way. :)
Well, here's an untested patch. It should be the same as before if
you don't do anything out of ordinary. It will allow you to override
the tags for ports and docs by PORTSRELEASETAG and DOCRELEASETAG if
you want a "frozen" version of either.
===
Index: Makefile
===================================================================
RCS file: /usr/cvs/src/release/Makefile,v
retrieving revision 1.536.2.29
diff -u -r1.536.2.29 Makefile
--- Makefile 2000/11/05 22:41:06 1.536.2.29
+++ Makefile 2000/11/10 12:37:14
@@ -33,6 +33,8 @@
.if ${ISRELEASE} != 0
# Convert "RELENG_ver_RELEASE" to "RELEASE_ver" for ports and doc trees.
AUXRELEASETAG!= echo ${RELEASETAG} | sed -e 's/^RELENG_/RELEASE_/' -e 's/_RELEASE$$//'
+DOCRELEASETAG?= ${AUXRELEASETAG}
+PORTSRELEASETAG?= ${AUXRELEASETAG}
.endif
.endif
@@ -216,15 +218,15 @@
cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
.endif
.if !defined(NOPORTS)
-.if defined(AUXRELEASETAG)
- cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co -P -r ${AUXRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
+.if defined(PORTSRELEASETAG)
+ cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
.else
cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co -P ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
.endif
.endif
.if !defined(NODOC)
-.if defined(AUXRELEASETAG)
- cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P -r ${AUXRELEASETAG} ${RELEASEDOCMODULE}
+.if defined(DOCRELEASETAG)
+ cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE}
.else
cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
.endif
===
Satoshi
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vqcvgtwknip.fsf>