From owner-freebsd-current  Tue Jan 25 12:49:35 2000
Delivered-To: freebsd-current@freebsd.org
Received: from smtp6.mindspring.com (smtp6.mindspring.com [207.69.200.110])
	by hub.freebsd.org (Postfix) with ESMTP id 92C6015381
	for <current@freebsd.org>; Tue, 25 Jan 2000 12:49:13 -0800 (PST)
	(envelope-from rajappa@mindspring.com)
Received: from kamikaze.mindspring.com (user-2ive6kv.dialup.mindspring.com [165.247.26.159])
	by smtp6.mindspring.com (8.9.3/8.8.5) with ESMTP id PAA29945
	for <current@freebsd.org>; Tue, 25 Jan 2000 15:49:01 -0500 (EST)
Received: (from rsi@localhost)
	by kamikaze.mindspring.com (8.9.3/8.9.3) id PAA00478;
	Tue, 25 Jan 2000 15:54:23 -0500 (EST)
	(envelope-from rajappa@mindspring.com)
Message-Id: <200001252054.PAA00478@kamikaze.mindspring.com>
X-Authentication-Warning: kamikaze.mindspring.com: rsi set sender to rajappa@mindspring.com using -f
To: current@freebsd.org
Subject: Re: make release failure
References: <200001251859.MAA28792@panther.txn.cpqcorp.net>
From: Rajappa Iyer <rajappa@mindspring.com>
Date: 25 Jan 2000 15:54:13 -0500
Reply-To: rajappa@mindspring.com
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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