Date: Tue, 21 Oct 2003 16:51:22 +0930 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: Anthony Fajri <fajri@ee.itb.ac.id>, freebsd-current@freebsd.org Subject: Re: make release... Message-ID: <200310211651.22237.doconnor@gsoft.com.au> In-Reply-To: <20031021140013.P25925-100000@gerbang.pl.itb.ac.id> References: <20031021140013.P25925-100000@gerbang.pl.itb.ac.id>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_y5Nl/kBJUJNLCpU Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tuesday 21 October 2003 16:31, Anthony Fajri wrote: > fajri >> more stable-supfile|grep release > *default release=cvs tag=RELENG_4 You aren't syncing the repo with cvsup so the check out in make release doesn't work. Either apply the patch I attached and add CPNOTCVS= to your make release options, or check out the repository. PS the lack of commentry in your email isn't very polite IMO. -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 9A8C 569F 685A D928 5140 AE4B 319B 41F4 5D17 FDD5 --Boundary-00=_y5Nl/kBJUJNLCpU Content-Type: text/x-diff; charset="iso-8859-1"; name="genesis-patch-ae" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="genesis-patch-ae" Index: release/Makefile =================================================================== RCS file: /usr/local/ncvs/src/release/Makefile,v retrieving revision 1.536.2.110 diff -u -r1.536.2.110 Makefile --- release/Makefile 10 May 2003 23:01:29 -0000 1.536.2.110 +++ release/Makefile 9 Oct 2003 04:49:50 -0000 @@ -281,6 +281,10 @@ if [ -f /etc/resolv.conf ]; then \ cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ fi +.if defined(CPNOTCVS) + cd ${CHROOTDIR}/usr && rm -rf src && \ + mkdir src && cp -pRP ${CVSROOT}/src/* src/ +.else .if !defined(RELEASETAG) cd ${CHROOTDIR}/usr && rm -rf src && \ cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE} @@ -288,6 +292,8 @@ cd ${CHROOTDIR}/usr && rm -rf src && \ cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE} .endif +.endif +.endif .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} .endif @@ -295,11 +301,16 @@ cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif .if !defined(NOPORTS) +.if defined(CPNOTCVS) + cd ${CHROOTDIR}/usr && rm -rf ports && \ + mkdir ports && cp -pRP ${CVSROOT}/ports/* ports/ +.else .if defined(PORTSRELEASETAG) cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} .else cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEPORTSMODULE} .endif +.endif .elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES" .if defined(PORTSRELEASETAG) cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS} @@ -308,11 +319,15 @@ .endif .endif .if !defined(NODOC) +.if defined(CPNOTCVS) + cd ${CHROOTDIR}/usr && rm -rf doc && mkdir doc && cp -pRP ${CVSROOT}/doc/* doc/ +.else .if defined(DOCRELEASETAG) cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE} .else cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE} .endif +.endif if [ -d ${RELEASEDISTFILES}/ ]; then \ cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \ else \ @@ -327,7 +342,6 @@ done .endif .endif -.endif .if make(rerelease) .if !defined(RELEASENOUPDATE) .if !defined(RELEASETAG) @@ -344,7 +358,12 @@ done .endif .if !defined(NODOC) +.if defined(CPNOTCVS) + cd ${CHROOTDIR}/usr && rm -rf src && \ + mkdir doc && cp -pRP ${CVSROOT}/doc/* doc/ +.else cd ${CHROOTDIR}/usr/doc && cvs -R -q update ${CVSCMDARGS} -P -d +.endif .endif .endif .endif --Boundary-00=_y5Nl/kBJUJNLCpU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310211651.22237.doconnor>