From owner-freebsd-stable  Sat May 22  5: 9:12 1999
Delivered-To: freebsd-stable@freebsd.org
Received: from relay.ucb.crimea.ua (relay.ucb.crimea.ua [212.110.138.1])
	by hub.freebsd.org (Postfix) with ESMTP id 8D2A214E15
	for <stable@freebsd.org>; Sat, 22 May 1999 05:08:43 -0700 (PDT)
	(envelope-from ru@ucb.crimea.ua)
Received: (from ru@localhost)
	by relay.ucb.crimea.ua (8.9.3/8.9.3/UCB) id PAA72291;
	Sat, 22 May 1999 15:01:14 +0300 (EEST)
	(envelope-from ru)
Date: Sat, 22 May 1999 15:01:13 +0300
From: Ruslan Ermilov <ru@ucb.crimea.ua>
To: Vadim Chekan <vadim@gc.lviv.ua>
Cc: stable@freebsd.org
Subject: Re: Error in /usr/src/etc/Makefile
Message-ID: <19990522150113.A69072@relay.ucb.crimea.ua>
Mail-Followup-To: Vadim Chekan <vadim@gc.lviv.ua>, stable@freebsd.org
References: <37468DDB.6C296E49@gc.lviv.ua> <19990522141510.A60899@relay.ucb.crimea.ua> <374697A8.242D6D4D@gc.lviv.ua>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.95.3i
In-Reply-To: <374697A8.242D6D4D@gc.lviv.ua>; from Vadim Chekan on Sat, May 22, 1999 at 02:40:24PM +0300
X-Operating-System: FreeBSD 3.2-STABLE i386
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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.

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.

Advice: upgrade to 2.2.8-STABLE first, then ``make upgrade'' to 3.2-STABLE.

> > > 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}
                                         ^^^^^^^^^^^^^^^^^^^^^^

-- 
Ruslan Ermilov		Sysadmin and DBA of the
ru@ucb.crimea.ua	United Commercial Bank
+380.652.247.647	Simferopol, Ukraine

http://www.FreeBSD.org	The Power To Serve
http://www.oracle.com	Enabling The Information Age


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