Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp Remove the importdate hack to make things m...



details:   https://anonhg.NetBSD.org/src/rev/211b3d3d5ab1
branches:  trunk
changeset: 372624:211b3d3d5ab1
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 13 18:36:41 2022 +0000

description:
Remove the importdate hack to make things more similar with the upstream
script.

diffstat:

 external/bsd/ntp/importdate    |   1 -
 external/bsd/ntp/scripts/mkver |  18 ++----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diffs (40 lines):

diff -r ffdfb4c71d9d -r 211b3d3d5ab1 external/bsd/ntp/importdate
--- a/external/bsd/ntp/importdate       Tue Dec 13 18:27:45 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Sun Oct  9 17:37:20 EDT 2022 (import)
diff -r ffdfb4c71d9d -r 211b3d3d5ab1 external/bsd/ntp/scripts/mkver
--- a/external/bsd/ntp/scripts/mkver    Tue Dec 13 18:27:45 2022 +0000
+++ b/external/bsd/ntp/scripts/mkver    Tue Dec 13 18:36:41 2022 +0000
@@ -23,13 +23,7 @@
    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 @@
     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}>";
 



Home | Main Index | Thread Index | Old Index