From owner-freebsd-stable  Sat May 22  5:29:10 1999
Delivered-To: freebsd-stable@freebsd.org
Received: from extra.gc.lviv.ua (unknown [195.5.17.246])
	by hub.freebsd.org (Postfix) with ESMTP id 0363F14E15
	for <stable@FreeBSD.ORG>; Sat, 22 May 1999 05:27:46 -0700 (PDT)
	(envelope-from vadim@gc.lviv.ua)
Received: from gate.gc.lviv.ua (gate.gc.lviv.ua [192.168.168.18])
	by extra.gc.lviv.ua (8.9.3/8.9.3) with ESMTP id PAA74264
	for <stable@FreeBSD.ORG>; Sat, 22 May 1999 15:27:44 +0300 (EEST)
Received: from gc.lviv.ua (intra.gc.lviv.ua [192.168.1.93])
	by gate.gc.lviv.ua (8.9.3/8.9.3) with ESMTP id PAA40476
	for <stable@FreeBSD.ORG>; Sat, 22 May 1999 15:27:44 +0300 (EEST)
Message-ID: <3746A1E7.23E43E44@gc.lviv.ua>
Date: Sat, 22 May 1999 15:24:07 +0300
From: Vadim Chekan <vadim@gc.lviv.ua>
Organization: Galitsky Kontrakty
X-Mailer: Mozilla 4.6 [en] (WinNT; I)
X-Accept-Language: uk,ru,en
MIME-Version: 1.0
To: "stable@FreeBSD.ORG" <stable@FreeBSD.ORG>
Subject: Re: Error in /usr/src/etc/Makefile
References: <37468DDB.6C296E49@gc.lviv.ua> <19990522141510.A60899@relay.ucb.crimea.ua> <374697A8.242D6D4D@gc.lviv.ua> <19990522150113.A69072@relay.ucb.crimea.ua>
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG



Ruslan Ermilov wrote:
> 
> On Sat, May 22, 1999 at 02:40:24PM +0300, Vadim Chekan wrote:
> >
> >
> > Ruslan Ermilov wrote:
> > >
> > > On Sat, May 22, 1999 at 01:58:35PM +0300, Vadim Chekan wrote:
> > > > Hello everybody!
> > > >
> > > > I've got a troubles when I tryed to upgrade from sourses my 2.2.5 box to
> > > > 3.2-RELEASE
> > > > in /usr/src/etc/Makefile:13
> > > > etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \
> > > >
> > > Use ``make upgrade'' option.
> >
> > I use mergemaster version-1.24 :)
> >
> ``mergemaster'' is just a supplement for ``make world''.
> It's not supposed for 2.2.x -> 3.x jumps.

Why? I think it's version-independed. It just help to compare and
correct files in /etc
I'd had to install new aout version of mtree but it's pretty simple
Now I'm in the middle of the way :)

> 
> In your case (2.2.5 -> 3.2), use ``make upgrade'' if you want to upgrade
> from sources.  Another possibility would be the ``binary'' upgrade option
> of sysinstall.

I'm doing remote upgrade on box in other city.
I know, I can do it from binary so. But I prefer sources.
> 
> Advice: upgrade to 2.2.8-STABLE first, then ``make upgrade'' to 3.2-STABLE.

I did this on another macine, but if I can work around my problems, it's
too long way

> 
> > > > But where is MACHINE_ARCH defined?
> > > > Only place where I meneged to find it is /usr/ports/Mk/bsd.port.mk
> > > > In /usr/src/etc/Makefile is only one ".include"
> > > > .include <bsd.prog.mk>
> > > >
> > > It's not defined in 2.2.5.  You can find it in /usr/src/share/mk/sys.mk.
> >
> > Ok, It's true. I think in this case /usr/src/share/mk/sys.mk must be
> > included in /usr/src/etc/Makefile
> > Isn't it?
> >
> It is (from /usr/src/Makefile):
> #
> # Handle the user-driven targets, using the source relative mk files.
> #
> ${TGTS} : upgrade_checks
>         @cd ${.CURDIR}; \
>                 ${MAKE} -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET}

I haven't time to check all this more carefully, but MACHINE_ARCH was
undefined, and mergemaster fail to 
install ... etc./rc ...
(must be etc.i386)

Vadim Chekan


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message