From owner-freebsd-hackers  Thu Oct 16 18:20:24 1997
Return-Path: <owner-freebsd-hackers>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id SAA07739
          for hackers-outgoing; Thu, 16 Oct 1997 18:20:24 -0700 (PDT)
          (envelope-from owner-freebsd-hackers)
Received: from alpo.whistle.com (alpo.whistle.com [207.76.204.38])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id SAA07731
          for <hackers@FreeBSD.ORG>; Thu, 16 Oct 1997 18:20:20 -0700 (PDT)
          (envelope-from julian@whistle.com)
Received: (from daemon@localhost)
	by alpo.whistle.com (8.8.5/8.8.5) id SAA06184
	for <hackers@FreeBSD.ORG>; Thu, 16 Oct 1997 18:11:45 -0700 (PDT)
Received: from current1.whistle.com(207.76.205.22)
 via SMTP by alpo.whistle.com, id smtpd006179; Fri Oct 17 01:11:39 1997
Message-ID: <3446BAFA.5656AEC7@whistle.com>
Date: Thu, 16 Oct 1997 18:10:18 -0700
From: Julian Elischer <julian@whistle.com>
Organization: Whistle Communications
X-Mailer: Mozilla 3.0Gold (X11; I; FreeBSD 2.2-CURRENT i386)
MIME-Version: 1.0
To: hackers@FreeBSD.ORG
Subject: Re: make world in 2.2.5(*) fails on 2.2.2 release (from CD) machine
References: <3446AF8A.2C67412E@whistle.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-hackers@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

OK I found qhat it is..
Jordan did a 'hack' on newvers.sh for th erelease,
so when you upgrade, you get a CVS conflict.
As 2.2.2 is out hte door there is nothing we can do about this.

I assume, Jordan that when you take the 2.2.5 snapshot, you'll
temporarily check in a version of newvers.sh that says 2.2.5?
so that it is not a 'modified' file in the tree?

sorry for the alarm, but with 4 days to go I though it was 
a bad thing to happen.

(I'm trying to build a fresh 2.2.5(*) tree to test the appletalk
problem)


julian

Julian Elischer wrote:
> 
> procedure..
> install 2.2.2 from cd on virgin machine.
> 
> check out /usr/src using CVS with tag RELENG_2_2
> cd /usr/src
> make world
> 
> make world  fails in make includes
> trying to make osreldate.h
> 
> This has been broken for about 1 year now but I always
> blamed 'residual cruft'
> I never tried it on a virgin machine till today
> 
> julian