Date: Fri, 25 Feb 2000 10:15:36 -0500 (EST) From: Matt Loschert <loschert@servint.com> To: "Michael R. Wayne" <wayne@staff.msen.com> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: Make fails to propagate variables? Message-ID: <Pine.BSF.4.21.0002251010140.50874-200000@delft.servint.com> In-Reply-To: <Pine.BSF.4.21.0002231752490.11813-200000@delft.servint.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Wed, 23 Feb 2000, Matt Loschert wrote:
> I actually was looking into this about a week ago. Applying the attached
> patch to /usr/src/release/Makefile replaces the cvs checkout with a
> recursive copy from local sources. Note: I had to use -L with cp since my
> /usr/src is a symlink.
>
> If your local cvsup'd repo is in /usr/src/, /usr/ports, and /usr/doc, set
> CVSROOT to /usr and the patch should do the trick.
>
> BTW, I still haven't gotten make release to work all the way through. My
> build stops while trying to run makewhatis in the chroot'ed build
> environment. I can't figure out why, so maybe I *am* doing something
> wrong. Anyway, good luck.
I was looking at the make release procedure again this morning and
rereading my email and diff and realized that I left out a necessary
change in the original diff. Attached is one that should work.
Also, I realized my problem with makewhatis was that it was looking for an
installed perl in the chroot'ed environment. My original buildworld had
been done with NOPERL=true specified in make.conf, hence no perl. I am
retrying again as I write this.
Anyway, again, good luck, and hope this helps.
Matt
--
Matt Loschert
Software Engineer
ServInt Internet Services
[-- Attachment #2 --]
--- Makefile.dist Fri Feb 25 10:06:02 2000
+++ Makefile.localrepo Fri Feb 25 10:07:56 2000
@@ -170,13 +170,8 @@
for i in ${BOOTSTRAPUTILS} ; do \
cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \
done
-.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr && rm -rf src && \
- cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE}
-.else
- cd ${CHROOTDIR}/usr && rm -rf src && \
- cvs -R -d ${CVSROOT} co -P -r ${RELEASETAG} ${RELEASESRCMODULE}
-.endif
+ cp -RL ${CVSROOT}/${RELEASESRCMODULE} ${RELEASESRCMODULE}
.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES}
.endif
@@ -184,10 +179,10 @@
cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
.endif
.if !defined(NOPORTS)
- cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co -P ${RELEASEPORTSMODULE} && cd ports && make readmes PORTSDIR=${CHROOTDIR}/usr/ports
+ cd ${CHROOTDIR}/usr && rm -rf ports && cp -RL ${CVSROOT}/${RELEASEPORTSMODULE} ${RELEASEPORTSMODULE} && cd ports && make readmes PORTSDIR=${CHROOTDIR}/usr/ports
.endif
.if !defined(NODOC)
- cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
+ cd ${CHROOTDIR}/usr && rm -rf doc && cp -RL ${CVSROOT}/${RELEASEDOCMODULE} ${RELEASEDOCMODULE}
if [ -d ${DISTFILES}/ ]; then \
cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0002251010140.50874-200000>