From owner-freebsd-questions@FreeBSD.ORG  Fri Apr 24 04:43:47 2009
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83FE3106564A
	for <freebsd-questions@freebsd.org>;
	Fri, 24 Apr 2009 04:43:47 +0000 (UTC)
	(envelope-from andrsn@andrsn.stanford.edu)
Received: from smtp1.stanford.edu (smtp1.Stanford.EDU [171.67.219.81])
	by mx1.freebsd.org (Postfix) with ESMTP id 6ED628FC14
	for <freebsd-questions@freebsd.org>;
	Fri, 24 Apr 2009 04:43:47 +0000 (UTC)
	(envelope-from andrsn@andrsn.stanford.edu)
Received: from smtp1.stanford.edu (localhost.localdomain [127.0.0.1])
	by localhost (Postfix) with SMTP id 4F1541707F0;
	Thu, 23 Apr 2009 21:43:47 -0700 (PDT)
Received: from andrsn.stanford.edu (andrsn.Stanford.EDU [171.66.112.163])
	by smtp1.stanford.edu (Postfix) with ESMTP id C8BD417075A;
	Thu, 23 Apr 2009 21:43:44 -0700 (PDT)
Date: Thu, 23 Apr 2009 21:47:26 -0700 (PDT)
From: Annelise Anderson <andrsn@andrsn.stanford.edu>
To: Giorgos Keramidas <keramida@ceid.upatras.gr>
In-Reply-To: <87k55a3jcc.fsf@kobe.laptop>
Message-ID: <alpine.BSF.2.00.0904232146500.1127@andrsn.stanford.edu>
References: <alpine.BSF.2.00.0904231451480.1109@andrsn.stanford.edu>
	<87k55a3jcc.fsf@kobe.laptop>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: freebsd-questions@freebsd.org, Anderson@Hoover.Stanford.EDU
Subject: Re: Mergemaster Problem
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Apr 2009 04:43:47 -0000

On Fri, 24 Apr 2009, Giorgos Keramidas wrote:

> On Thu, 23 Apr 2009 14:54:25 -0700 (PDT), Annelise Anderson <andrsn@andrsn.stanford.edu> wrote:
>> I'm running mergemaster as root (-v -i -c) on an upgrade to
>> stable (I rebooted with the new kernel but have not done
>> the install) and can't run mergemaster, with result as follows:
>>
>>   Default is to use /var/tmp/temproot as is
>>
>> How should I deal with this? [Use the existing /var/tmp/temproot] d
>>
>>    *** Deleting the old /var/tmp/temproot
>>
>> *** Creating the temporary root environment in /var/tmp/temproot
>>  *** /var/tmp/temproot ready for use
>>  *** Creating and populating directory structure in /var/tmp/temproot
>>
>>  *** Press the [Enter] or [Return] key to continue
>> "/usr/src/etc/Makefile", line 34: Malformed conditional (${MK_AMD} != "no")
>> "/usr/src/etc/Makefile", line 36: if-less endif
> [...]
>>
>>   *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
>>       the temproot environment
>>
>> Any suggestions?
>
> Hi Annelise,
>
> It seems you are running mergemaster with a new kernel but with the old
> make(1) binary across a major release update.  Since part of the update
> process spawned by mergemaster depends on `make' and the `/usr/share/mk'
> files, you have to installworld before you can use the new megemaster
> script.
>
> The pre-buildworld mode of mergemaster (`mergemaster -p') should run
> fine even with an old userland and old `/usr/share/mk' files.  But you
> should install everything before you run a full mergemaster update of
> all files in `/etc'.
>
Right you are.  Thanks.  Now I understand what I was reading in UPDATING.

 	Annelise