Re: CVS commit: src/distrib/sets

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

On Thu, 02 Apr 2009, Izumi Tsutsui wrote:
> Log Message:
> Explicitly sort entries on preparing set files from METALOG.
> METALOG could have different order due to install(1) race
> on parallel builds, and mtree(8) doesn't sort files.
> Should fix inconsistent shared sets among builds as seen in
> /pub/NetBSD-daily/netbsd-5/200904010000Z/shared/ and
> /pub/NetBSD-daily/netbsd-5/200904010002Z/shared/ dirs.
> Okay'ed by snj@.

I think it would be better to do this in the sanitise_METALOG target in
src/distrib/sets/Makefile, like this:

--- distrib/sets/Makefile       13 Nov 2008 20:40:11 -0000      1.65
+++ distrib/sets/Makefile       3 Apr 2009 10:52:44 -0000
@@ -92,7 +92,7 @@
        | ${TOOL_MTREE} -C -k all -N ${NETBSDSRCDIR}/etc > ${METALOG}.new && \
                ( rm -f ${METALOG} ; \
                mv ${METALOG}.new ${METALOG} )
-       cat ${METALOG} | ${GREP} -v " optional" > ${.TARGET}
+       cat ${METALOG} | ${GREP} -v " optional" | sort -u > ${.TARGET}
 .endif
 
 .if defined(DESTDIR) && ${DESTDIR} != ""


It would also make sense to add a sort option to mtree.

--apb (Alan Barrett)