Subject: Re: i386-current not building distribution
To: Havard Eidnes <he@NetBSD.org>
From: Alan Barrett <apb@cequrux.com>
List: current-users
Date: 01/05/2006 21:24:14
On Thu, 05 Jan 2006, Alan Barrett wrote:
> I'll fix it soon.  For now, you can probably work around it by manually
> inserting a copy of etc/mtree/NetBSD.dist at the start of the metalog,
> or run your perl script.

Please try this patch.  It's not the right thing, but it should help.

--apb (Alan Barrett)

Index: src/distrib/sets/Makefile
--- Makefile	4 Jan 2006 15:11:07 -0000	1.50
+++ Makefile	5 Jan 2006 19:22:39 -0000
@@ -83,7 +83,8 @@
 .else
 sanitise_METALOG: .PHONY ${METALOG.sanitised}
 ${METALOG.sanitised}: ${METALOG}
-	${TOOL_MTREE} -C -k all -N ${NETBSDSRCDIR}/etc <${METALOG} >${.TARGET}
+	cat ${NETBSDSRCDIR}/etc/mtree/NetBSD.dist ${METALOG} \
+	| ${TOOL_MTREE} -C -k all -N ${NETBSDSRCDIR}/etc >${.TARGET}
 .endif
 
 .if defined(DESTDIR) && ${DESTDIR} != ""