Re: build.sh fails

[Alan Barrett <apb%cequrux.com@localhost>]

On Wed, 17 Jun 2009, Bruno Damour wrote:
> Build still fails with :
>
>    clean_METALOG ===> .
>    clean_METALOG ===> distrib/sets
>    /usr/src/../tools/bin/nbmtree -CS -k all -N /usr/src/etc
>    </usr/src/../obj/destdir.amd64/METALOG     
> >/usr/src/../obj/destdir.amd64/METALOG.new
>    nbmtree: existing entry for `ld.elf_so-i386', type `file' does not
>    match type `link'
>    nbmtree: failed at line 68852 of the specification

I'd guess that the old METALOG contains more than one line for
"ld.elf_so-i386", where the earlier line has type=link and the later
line has type=file (or vice versa); this is probably the result of
changes in the souce tree between one build and the next.

Does the following patch help?

--apb (Alan Barrett)

Index: distrib/sets/Makefile
--- distrib/sets/Makefile       23 Apr 2009 09:37:03 -0000      1.67
+++ distrib/sets/Makefile       17 Jun 2009 08:29:30 -0000
@@ -94,7 +94,7 @@
 METALOG.unpriv= -M ${METALOG}.sanitised
 sanitise_METALOG: .PHONY ${METALOG}.sanitised
 ${METALOG}.sanitised: ${METALOG}
-       ${TOOL_MTREE} -CS -k all -N ${NETBSDSRCDIR}/etc <${METALOG} \
+       ${TOOL_MTREE} -CSM -k all -N ${NETBSDSRCDIR}/etc <${METALOG} \
            >${METALOG}.new
        mv ${METALOG}.new ${METALOG}.sanitised
 .if ${MKUPDATE} == "no" || !exists(${METALOG})