Module Name: src
Committed By: apb
Date: Wed Jan 15 12:58:23 UTC 2014
Modified Files:
src/external/bsd/ntp/scripts: mkver
Log Message:
If the "importdate" file exists, do not embed the date/time/build number
in the generated version. This logic was present in an earlier revision
of this file, but was lost in CVS revision 1.3 dated 2013-12-28.
Add a comment to make it less likely that this code is lost again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/scripts/mkver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.3 src/external/bsd/ntp/scripts/mkver:1.4
--- src/external/bsd/ntp/scripts/mkver:1.3 Sat Dec 28 03:36:15 2013
+++ src/external/bsd/ntp/scripts/mkver Wed Jan 15 12:58:23 2014
@@ -15,16 +15,23 @@ case "o" in
*) ConfStr="${ConfStr}-o" ;;
esac
-ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
+ifile="`dirname $0`/../importdate"
-if [ ! -f .version ]; then
- echo 0 > .version
-fi
-RUN="`cat .version`"
-RUN="`expr $RUN + 1`"
-echo $RUN > .version
+if [ -f "$ifile" ]; then
+ # NetBSD MKREPRO: Don't embed current date/time/run number
+ ConfStr="$ConfStr "`cat "$ifile"`
+else
+ ConfStr="$ConfStr `LC_TIME=C TZ= date`"
+
+ if [ ! -f .version ]; then
+ echo 0 > .version
+ fi
+ RUN="`cat .version`"
+ RUN="`expr $RUN + 1`"
+ echo $RUN > .version
-ConfStr="$ConfStr (${RUN})"
+ ConfStr="$ConfStr (${RUN})"
+fi
echo "Version <${ConfStr}>";
