Date: 25 Jan 2000 15:54:13 -0500 From: Rajappa Iyer <rajappa@mindspring.com> To: current@freebsd.org Subject: Re: make release failure Message-ID: <200001252054.PAA00478@kamikaze.mindspring.com> References: <200001251859.MAA28792@panther.txn.cpqcorp.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Bruce Burden <bruce.burden@compaq.com> writes:
> >
> > make release fails on "make world" with:
> >
> > !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
> > >>> You must define the value of USA_RESIDENT as 'YES' or
> > >>> 'NO' as appropriate, in the environment or /etc/make.conf
> > >>> before building can proceed.
> > !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
> >
> > The problem is that $CHROOTDIR/etc/make.conf is never created by make
> > release. What am I missing?
> >
> /etc files are never installed by "make installworld". You
> have to install these files yourself, or use something like
> mergemaster(8).
>
> make.conf in found in /usr/src/etc/etc.[i386,alpha]/make.conf
Yes, but $CHROOTDIR/etc is populated by "make installworld" when I do
a "make release". My ``real'' /etc/make.conf exists and has the
appropriate value for USA_RESIDENT.
I see that /usr/src/release/Makefile does copy /etc/resolv.conf to
${CHROOTDIR}/etc. Maybe it should do the same for /etc/make.conf.
What do people think of the following patch?
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.530
diff -c -r1.530 Makefile
*** Makefile 2000/01/24 01:22:30 1.530
--- Makefile 2000/01/25 20:52:53
***************
*** 37,42 ****
--- 37,46 ----
# Unless set elsewhere, indicate the object format we'll be using.
OBJFORMAT?= elf
+ # make world needs make.conf which make installworld will not install
+ # in ${CHROOTDIR}/etc.
+ MAKECONF?= /etc/make.conf
+
# Uncomment this to disable the doc.1 target. It is also an ERROR
# to set NOPORTS and not set NODOC since docs depend on ports.
#NODOC= YES
***************
*** 155,160 ****
--- 159,167 ----
cd ${.CURDIR}/../etc && ${MAKE} distribution DESTDIR=${CHROOTDIR}
if [ -f /etc/resolv.conf ]; then \
cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
+ fi
+ if [ -f ${MAKECONF} ]; then \
+ cp -p ${MAKECONF} ${CHROOTDIR}/etc; \
fi
cd ${.CURDIR}/.. && ${MAKE} installworld DESTDIR=${CHROOTDIR} NOMAN=1
mkdir ${CHROOTDIR}/${BOOTSTRAPDIR}
Thanks,
Rajappa
--
<rajappa@mindspring.com> a.k.a. Rajappa Iyer. New York, New York.
We're too busy mopping the floor to turn off the faucet.
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?200001252054.PAA00478>