Module Name: src
Committed By: tsutsui
Date: Thu Apr 2 23:06:16 UTC 2009
Modified Files:
src/distrib/sets: maketars
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 s...@.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/maketars
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.65 src/distrib/sets/maketars:1.66
--- src/distrib/sets/maketars:1.65 Thu Apr 2 18:06:54 2009
+++ src/distrib/sets/maketars Thu Apr 2 23:06:16 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.65 2009/04/02 18:06:54 perry Exp $
+# $NetBSD: maketars,v 1.66 2009/04/02 23:06:16 tsutsui Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -148,7 +148,8 @@
(
echo "/set uname=root gname=wheel"
${AWK} -f "${rundir}/join.awk" \
- "${SDIR}/flist.${setname}.full" "${metalog}"
+ "${SDIR}/flist.${setname}.full" "${metalog}" \
+ | ${SORT} -u
echo "./etc/mtree/set.${setname} type=file mode=0444"
) | ${MTREE} -C -k all -R time -N "${etcdir}" \
> "${setlistdir}/set.${setname}"
