Module Name: src
Committed By: christos
Date: Tue Dec 13 18:36:42 UTC 2022
Modified Files:
src/external/bsd/ntp/scripts: mkver
Removed Files:
src/external/bsd/ntp: importdate
Log Message:
Remove the importdate hack to make things more similar with the upstream
script.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r0 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.18 -r1.19 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.18 src/external/bsd/ntp/scripts/mkver:1.19
--- src/external/bsd/ntp/scripts/mkver:1.18 Tue Dec 13 13:27:45 2022
+++ src/external/bsd/ntp/scripts/mkver Tue Dec 13 13:36:41 2022
@@ -23,13 +23,7 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then
ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -d@$SOURCE_DATE_EPOCH 2>/dev/null`" ||
ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -r $SOURCE_DATE_EPOCH`"
else
- ifile="`dirname $0`/../importdate"
- 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=UTC date`"
- fi
+ ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
fi
if [ -n "$MKREPRO_TIMESTAMP" ]; then
@@ -43,15 +37,7 @@ else
echo $RUN > .version
fi
-if [ -f "$ifile" ]; then
- # NetBSD MKREPRO: Don't embed current date/time/run number
-else
- RUN="`cat .version`"
- RUN="`expr $RUN + 1`"
- echo $RUN > .version
-
- ConfStr="$ConfStr (${RUN})"
-fi
+ConfStr="$ConfStr (${RUN})"
echo "Version <${ConfStr}>";
