build, flock-build, and buildkey updates from stenn@ntp.org

bk: 666e7ca7jDHqu_t8vXcv52vEO-H7DA

diff --git a/ChangeLog b/ChangeLog
index f4a196aa57cd0dd8b3393a44cad0c0c35587d361..dad7b483bbd23a51f1cc4651cc9d7bd0410b81fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+---
+* build script: Use hostname.site for NTF build hosts.  Use the full
+  hostname for the buildkey.  <stenn@ntp.org>
+* flock-build: Try to use the full hostname for the buildkey.  <stenn@ntp.org>
+
 ---
 (4.2.8p18) 2024/05/25 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/build b/build
index f6dca6b350e4978b5882b606f8aedba540cef6a8..fa90c22a518a72ea4f4ee43ee92946158326e332 100755 (executable)
--- a/build
+++ b/build
@@ -2,7 +2,8 @@
 
 LOGF=make.log
 IAM=`hostname || uname -n`
-MYNAME=`IFS=. ; set $IAM ; echo $1`
+MYNAME=`echo $IAM | cut -d. -f1`
+MYNAME2=`echo $IAM | cut -d. -f1-2`
 SIG=
 
 case "$1" in
@@ -10,7 +11,7 @@ case "$1" in
     SIG=$1
     shift
     CONFIG_ARGS="$@"
-    KEY=`sed -e q < .buildkey-$MYNAME`
+    KEY=`sed -e q < .buildkey-$IAM`
     case "$SIG" in
      $KEY) ;;
      *)
@@ -52,9 +53,12 @@ esac
 case "$NTP_BDIR" in
  '')
     case "$IAM" in
-     *.ntp.org | *.ntfo.org)
+     *.ntp.org)
        NTP_BDIR=host
        ;;
+     *.ntfo.org)
+       NTP_BDIR=host2
+       ;;
      *.udel.edu)
        NTP_BDIR=host
        # HMS: --enable-local-libopts is the default now...
@@ -76,6 +80,9 @@ case "$NTP_BDIR" in
  host) 
     BASEDIR=A.$MYNAME
     ;;
+ host2) 
+    BASEDIR=A.$MYNAME2
+    ;;
  cvo)
     BASEDIR=A.$CVO
     ;;

diff --git a/flock-build b/flock-build
index 14767b934e17367411c548ed44ca7a72a6083799..07ac3d6f185ae4e26b22cbc535760c217995b769 100755 (executable)
--- a/flock-build
+++ b/flock-build
@@ -7,7 +7,7 @@ case "$1" in
  '--one'|'-1')
      shift
      FB_FIRSTONLY=1
-     LIST=$MYNAME
+     LIST=$IAM
      ;;
  *)
      FB_FIRSTONLY=0
@@ -51,7 +51,7 @@ c_d=${PWD:-`pwd`}
 SIG=`perl -e 'print rand'`
 
 case "$LIST" in
- '') LIST="pogo" ;;
+ '') LIST="pogo.udel.edu" ;;
 esac
 
 for i in $LIST