From owner-freebsd-current Fri Jan 21 12: 8:47 2000 Delivered-To: freebsd-current@freebsd.org Received: from uni4nn.gn.iaf.nl (osmium.gn.iaf.nl [193.67.144.12]) by hub.freebsd.org (Postfix) with ESMTP id 23F1F14D66 for ; Fri, 21 Jan 2000 12:08:42 -0800 (PST) (envelope-from wilko@yedi.iaf.nl) Received: from yedi.iaf.nl (uucp@localhost) by uni4nn.gn.iaf.nl (8.9.2/8.9.2) with UUCP id UAA10323; Fri, 21 Jan 2000 20:53:56 +0100 (MET) Received: (from wilko@localhost) by yedi.iaf.nl (8.9.3/8.9.3) id UAA00882; Fri, 21 Jan 2000 20:19:25 +0100 (CET) (envelope-from wilko) Date: Fri, 21 Jan 2000 20:19:25 +0100 From: Wilko Bulte To: Peter Wemm Cc: John Hay , FreeBSD-current Subject: Re: make release broken Message-ID: <20000121201925.B741@yedi.iaf.nl> References: <20000121091536.A8F181CA0@overcee.netplex.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: <20000121091536.A8F181CA0@overcee.netplex.com.au>; from peter@netplex.com.au on Fri, Jan 21, 2000 at 05:15:36PM +0800 X-OS: FreeBSD yedi.iaf.nl 3.4-STABLE FreeBSD 3.4-STABLE X-PGP: finger wilko@freebsd.org Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Fri, Jan 21, 2000 at 05:15:36PM +0800, Peter Wemm wrote: > Wilko Bulte wrote: > > On Fri, Jan 21, 2000 at 09:19:22AM +0200, John Hay wrote: > [..] > > > cp: /usr/src/release/texts/HARDWARE.TXT: No such file or directory > > > *** Error code 1 > [..] > > > It looks like the handling of HARDWARE.TXT in release/Makefile is broken. > > > > Duh.. John Polstra is working on cvs-moving i386/HARDWARE.TXT to make > > this file the starting point for the generic HARDWARE.TXT > > > > There were some problems in doing this with cvs > > > > I guess this needs some time to get resolved. > > OK, here's the deal.. There is already a texts/HARDWARE.TXT, but it's been > cvs rm'ed from -current. Since it's in use on 3.4, we can't just clobber > it. > > So, if you want to move i386/HARDWARE.TXT up a level you're just going to > have to copy the file and cvs add it in the new location. This will > "revive" it in -current. We can't do anything about the lost history in > i386/HARDWARE.TXT. > > Well, strictly speaking it can be merged but it's much more painful than > it's worth. :-/ Just re-add the file and lets get on with it. Just commited this workaround. Thanks for your help/patience. -- Wilko Bulte Arnhem, The Netherlands - The FreeBSD Project WWW : http://www.tcja.nl http://www.freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message