Commit 1007a582 authored by Mike Hibler's avatar Mike Hibler

More work, still not tested

parent d89310cb
...@@ -1251,11 +1251,46 @@ else ...@@ -1251,11 +1251,46 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
# Extract the first word of "uuidgen", so it can be a program name with args.
set dummy uuidgen; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1258: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UUIDGEN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$UUIDGEN" in
/*)
ac_cv_path_UUIDGEN="$UUIDGEN" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_UUIDGEN="$UUIDGEN" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_UUIDGEN="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
UUIDGEN="$ac_cv_path_UUIDGEN"
if test -n "$UUIDGEN"; then
echo "$ac_t""$UUIDGEN" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args.
set dummy ${ac_tool_prefix}ssh; ac_word=$2 set dummy ${ac_tool_prefix}ssh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1259: checking for $ac_word" >&5 echo "configure:1294: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1288,12 +1323,12 @@ fi ...@@ -1288,12 +1323,12 @@ fi
for ac_func in srandomdev for ac_func in srandomdev
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1292: checking for $ac_func" >&5 echo "configure:1327: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1297 "configure" #line 1332 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1316,7 +1351,7 @@ $ac_func(); ...@@ -1316,7 +1351,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1460,6 +1495,7 @@ done ...@@ -1460,6 +1495,7 @@ done
# #
...@@ -1520,6 +1556,7 @@ BUGDBSUPPORT=0 ...@@ -1520,6 +1556,7 @@ BUGDBSUPPORT=0
OPSDBSUPPORT=0 OPSDBSUPPORT=0
MAILMANSUPPORT=0 MAILMANSUPPORT=0
WINSUPPORT=0 WINSUPPORT=0
NSVERIFY=1
CVSSUPPORT=0 CVSSUPPORT=0
TRACSUPPORT=0 TRACSUPPORT=0
CHATSUPPORT=0 CHATSUPPORT=0
...@@ -2155,17 +2192,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h ...@@ -2155,17 +2192,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2151: checking for $ac_hdr" >&5 echo "configure:2195: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2156 "configure" #line 2200 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2204,17 +2241,17 @@ for ac_hdr in linux/videodev.h ...@@ -2204,17 +2241,17 @@ for ac_hdr in linux/videodev.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2200: checking for $ac_hdr" >&5 echo "configure:2244: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2205 "configure" #line 2249 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2247,7 +2284,7 @@ done ...@@ -2247,7 +2284,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2243: checking for $ac_word" >&5 echo "configure:2287: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2304,7 +2341,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -2304,7 +2341,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
echo "configure:2300: checking how to run the C++ preprocessor" >&5 echo "configure:2344: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2317,12 +2354,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -2317,12 +2354,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E" CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2313 "configure" #line 2357 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -2348,17 +2385,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ...@@ -2348,17 +2385,17 @@ echo "$ac_t""$CXXCPP" 1>&6
ac_safe=`echo "xercesc/dom/DOM.hpp" | sed 'y%./+-%__p_%'` ac_safe=`echo "xercesc/dom/DOM.hpp" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for xercesc/dom/DOM.hpp""... $ac_c" 1>&6 echo $ac_n "checking for xercesc/dom/DOM.hpp""... $ac_c" 1>&6
echo "configure:2344: checking for xercesc/dom/DOM.hpp" >&5 echo "configure:2388: checking for xercesc/dom/DOM.hpp" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2349 "configure" #line 2393 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <xercesc/dom/DOM.hpp> #include <xercesc/dom/DOM.hpp>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2422,7 +2459,7 @@ fi ...@@ -2422,7 +2459,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:2418: checking for a BSD compatible install" >&5 echo "configure:2462: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2483,7 +2520,7 @@ esac ...@@ -2483,7 +2520,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args. # Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2 set dummy rsync; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2479: checking for $ac_word" >&5 echo "configure:2523: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2902,6 +2939,7 @@ s%@ELVIN_CONFIG@%$ELVIN_CONFIG%g ...@@ -2902,6 +2939,7 @@ s%@ELVIN_CONFIG@%$ELVIN_CONFIG%g
s%@JAVAC@%$JAVAC%g s%@JAVAC@%$JAVAC%g
s%@JAR@%$JAR%g s%@JAR@%$JAR%g
s%@SUDO@%$SUDO%g s%@SUDO@%$SUDO%g
s%@UUIDGEN@%$UUIDGEN%g
s%@SSH@%$SSH%g s%@SSH@%$SSH%g
s%@optional_subdirs@%$optional_subdirs%g s%@optional_subdirs@%$optional_subdirs%g
s%@TBDBNAME@%$TBDBNAME%g s%@TBDBNAME@%$TBDBNAME%g
...@@ -2997,6 +3035,7 @@ s%@SSLCERT_ORGNAME@%$SSLCERT_ORGNAME%g ...@@ -2997,6 +3035,7 @@ s%@SSLCERT_ORGNAME@%$SSLCERT_ORGNAME%g
s%@FRISEBEEMCASTADDR@%$FRISEBEEMCASTADDR%g s%@FRISEBEEMCASTADDR@%$FRISEBEEMCASTADDR%g
s%@FRISEBEEMCASTPORT@%$FRISEBEEMCASTPORT%g s%@FRISEBEEMCASTPORT@%$FRISEBEEMCASTPORT%g
s%@WINSUPPORT@%$WINSUPPORT%g s%@WINSUPPORT@%$WINSUPPORT%g
s%@NSVERIFY@%$NSVERIFY%g
s%@CVSSUPPORT@%$CVSSUPPORT%g s%@CVSSUPPORT@%$CVSSUPPORT%g
s%@TRACSUPPORT@%$TRACSUPPORT%g s%@TRACSUPPORT@%$TRACSUPPORT%g
s%@CHATSUPPORT@%$CHATSUPPORT%g s%@CHATSUPPORT@%$CHATSUPPORT%g
...@@ -3009,6 +3048,7 @@ s%@PELABSUPPORT@%$PELABSUPPORT%g ...@@ -3009,6 +3048,7 @@ s%@PELABSUPPORT@%$PELABSUPPORT%g
s%@ELVIN_COMPAT@%$ELVIN_COMPAT%g s%@ELVIN_COMPAT@%$ELVIN_COMPAT%g
s%@ISOLATEADMINS@%$ISOLATEADMINS%g s%@ISOLATEADMINS@%$ISOLATEADMINS%g
s%@DYNAMICROOTPASSWORDS@%$DYNAMICROOTPASSWORDS%g s%@DYNAMICROOTPASSWORDS@%$DYNAMICROOTPASSWORDS%g
s%@TPM@%$TPM%g
s%@REMOTEWIKIDOCS@%$REMOTEWIKIDOCS%g s%@REMOTEWIKIDOCS@%$REMOTEWIKIDOCS%g
s%@PROTOGENI_SUPPORT@%$PROTOGENI_SUPPORT%g s%@PROTOGENI_SUPPORT@%$PROTOGENI_SUPPORT%g
s%@PROTOGENI_CLEARINGHOUSE@%$PROTOGENI_CLEARINGHOUSE%g s%@PROTOGENI_CLEARINGHOUSE@%$PROTOGENI_CLEARINGHOUSE%g
...@@ -3061,7 +3101,6 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g ...@@ -3061,7 +3101,6 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@RSYNC@%$RSYNC%g s%@RSYNC@%$RSYNC%g
s%@DISTCLEAN_FILES@%$DISTCLEAN_FILES%g s%@DISTCLEAN_FILES@%$DISTCLEAN_FILES%g
s%@TPM@%$TPM%g
CEOF CEOF
EOF EOF
......
...@@ -89,6 +89,7 @@ AC_PATH_PROG(ELVIN_CONFIG,elvin-config) ...@@ -89,6 +89,7 @@ AC_PATH_PROG(ELVIN_CONFIG,elvin-config)
AC_PATH_PROG(JAVAC,javac) AC_PATH_PROG(JAVAC,javac)
AC_PATH_PROG(JAR,jar) AC_PATH_PROG(JAR,jar)
AC_PATH_PROG(SUDO,sudo) AC_PATH_PROG(SUDO,sudo)
AC_PATH_PROG(UUIDGEN,uuidgen)
AC_CHECK_TOOL(SSH,ssh) AC_CHECK_TOOL(SSH,ssh)
...@@ -194,6 +195,7 @@ AC_SUBST(SSLCERT_ORGNAME) ...@@ -194,6 +195,7 @@ AC_SUBST(SSLCERT_ORGNAME)
AC_SUBST(FRISEBEEMCASTADDR) AC_SUBST(FRISEBEEMCASTADDR)
AC_SUBST(FRISEBEEMCASTPORT) AC_SUBST(FRISEBEEMCASTPORT)
AC_SUBST(WINSUPPORT) AC_SUBST(WINSUPPORT)
AC_SUBST(NSVERIFY)
AC_SUBST(CVSSUPPORT) AC_SUBST(CVSSUPPORT)
AC_SUBST(TRACSUPPORT) AC_SUBST(TRACSUPPORT)
AC_SUBST(CHATSUPPORT) AC_SUBST(CHATSUPPORT)
...@@ -274,6 +276,7 @@ BUGDBSUPPORT=0 ...@@ -274,6 +276,7 @@ BUGDBSUPPORT=0
OPSDBSUPPORT=0 OPSDBSUPPORT=0
MAILMANSUPPORT=0 MAILMANSUPPORT=0
WINSUPPORT=0 WINSUPPORT=0
NSVERIFY=1
CVSSUPPORT=0 CVSSUPPORT=0
TRACSUPPORT=0 TRACSUPPORT=0
CHATSUPPORT=0 CHATSUPPORT=0
......
...@@ -40,6 +40,7 @@ MIN_UNIX_UID=10000 ...@@ -40,6 +40,7 @@ MIN_UNIX_UID=10000
MIN_UNIX_GID=6000 MIN_UNIX_GID=6000
WINSUPPORT=1 WINSUPPORT=1
ELVIN_COMPAT=1 ELVIN_COMPAT=1
NSVERIFY=1
# #
# If enabled, needs setup, see: # If enabled, needs setup, see:
......
...@@ -39,6 +39,7 @@ BUGDBSUPPORT=changeme ...@@ -39,6 +39,7 @@ BUGDBSUPPORT=changeme
MAILMANSUPPORT=changeme MAILMANSUPPORT=changeme
OPSDBSUPPORT=changeme OPSDBSUPPORT=changeme
WINSUPPORT=0 WINSUPPORT=0
NSVERIFY=1
SFSSUPPORT=0 SFSSUPPORT=0
CVSSUPPORT=changeme CVSSUPPORT=changeme
NFSTRACESUPPORT=0 NFSTRACESUPPORT=0
......
...@@ -211,6 +211,12 @@ NAMED_FORWARDERS="1.1.1.1 1.1.2.1" ...@@ -211,6 +211,12 @@ NAMED_FORWARDERS="1.1.1.1 1.1.2.1"
# #
WINSUPPORT=0 WINSUPPORT=0
#
# Enable an NS verification path using a clean version of NS.
# There is no reason to disable this unless NS won't build on your ops node.
#
NSVERIFY=1
# #
# Virtual node network configuration (if you don't want virtual nodes, # Virtual node network configuration (if you don't want virtual nodes,
# just leave this as is) # just leave this as is)
......
...@@ -218,6 +218,12 @@ NAMED_FORWARDERS="1.1.1.1 1.1.2.1" ...@@ -218,6 +218,12 @@ NAMED_FORWARDERS="1.1.1.1 1.1.2.1"
# #
WINSUPPORT=0 WINSUPPORT=0
#
# Enable an NS verification path using a clean version of NS.
# There is no reason to disable this unless NS won't build on your ops node.
#
NSVERIFY=1
# #
# Virtual node network configuration (if you don't want virtual nodes, # Virtual node network configuration (if you don't want virtual nodes,
# just leave this as is) # just leave this as is)
......
...@@ -11,7 +11,7 @@ PORTNAME= emulab-boss ...@@ -11,7 +11,7 @@ PORTNAME= emulab-boss
.if ${OSMAJOR} > 6 .if ${OSMAJOR} > 6
PORTVERSION= 3.0 PORTVERSION= 3.0
.else .else
.if ${OSMAJOR} == 6 .if ${OSMAJOR} > 5
.if ${OSMINOR} >= 3 .if ${OSMINOR} >= 3
PORTVERSION= 2.1 PORTVERSION= 2.1
.else .else
...@@ -77,7 +77,7 @@ BUILD_DEPENDS= \ ...@@ -77,7 +77,7 @@ BUILD_DEPENDS= \
.endif .endif
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
lthread.[23456]:${PORTSDIR}/devel/linuxthreads \ lthread.[236]:${PORTSDIR}/devel/linuxthreads \
mhash.2:${PORTSDIR}/security/mhash \ mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \ mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 \ snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 \
......
...@@ -6,7 +6,10 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//' ...@@ -6,7 +6,10 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/' OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
PORTNAME= emulab-fs PORTNAME= emulab-fs
.if ${OSMAJOR} >= 6 .if ${OSMAJOR} > 6
PORTVERSION= 3.0
.else
.if ${OSMAJOR} > 5
.if ${OSMINOR} >= 3 .if ${OSMINOR} >= 3
PORTVERSION= 2.1 PORTVERSION= 2.1
.else .else
...@@ -15,6 +18,7 @@ PORTVERSION= 2.0 ...@@ -15,6 +18,7 @@ PORTVERSION= 2.0
.else .else
PORTVERSION= 1.4 PORTVERSION= 1.4
.endif .endif
.endif
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= #none MASTER_SITES= #none
DISTFILES= #none DISTFILES= #none
......
...@@ -7,7 +7,10 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//' ...@@ -7,7 +7,10 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/' OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
PORTNAME= emulab-ops PORTNAME= emulab-ops
.if ${OSMAJOR} >= 6 .if ${OSMAJOR} > 6
PORTVERSION= 3.0
.else
.if ${OSMAJOR} > 5
.if ${OSMINOR} >= 3 .if ${OSMINOR} >= 3
PORTVERSION= 2.1 PORTVERSION= 2.1
.else .else
...@@ -16,6 +19,7 @@ PORTVERSION= 2.0 ...@@ -16,6 +19,7 @@ PORTVERSION= 2.0
.else .else
PORTVERSION= 1.4 PORTVERSION= 1.4
.endif .endif
.endif
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= #none MASTER_SITES= #none
DISTFILES= #none DISTFILES= #none
...@@ -75,7 +79,7 @@ BUILD_DEPENDS= \ ...@@ -75,7 +79,7 @@ BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.endif .endif
LIB_DEPENDS= lthread.[23]:${PORTSDIR}/devel/linuxthreads \ LIB_DEPENDS= lthread.[236]:${PORTSDIR}/devel/linuxthreads \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
.if defined(ELVIN_COMPAT) .if defined(ELVIN_COMPAT)
......
...@@ -22,6 +22,7 @@ use GeniHRN; ...@@ -22,6 +22,7 @@ use GeniHRN;
my $TB = "@prefix@"; my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@"; my $TBOPS = "@TBOPSEMAIL@";
my $OURDOMAIN = "@OURDOMAIN@"; my $OURDOMAIN = "@OURDOMAIN@";
my $UUIDGEN = "@UUIDGEN@";
my $user = "geniuser"; my $user = "geniuser";
my $group = "GeniSlices"; my $group = "GeniSlices";
...@@ -76,7 +77,7 @@ sub FlushCaches() ...@@ -76,7 +77,7 @@ sub FlushCaches()
# #
sub NewUUID() sub NewUUID()
{ {
my $uuid = `/usr/bin/uuidgen`; my $uuid = `$UUIDGEN`;
if ($uuid =~ /^(\w{8}\-\w{4}\-\w{4}\-\w{4}\-\w{12})$/) { if ($uuid =~ /^(\w{8}\-\w{4}\-\w{4}\-\w{4}\-\w{12})$/) {
return $1; return $1;
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2002-2006 University of Utah and the Flux Group. # Copyright (c) 2002-2009 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
...@@ -8,10 +8,14 @@ TESTBED_SRCDIR = @top_srcdir@ ...@@ -8,10 +8,14 @@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = .. OBJDIR = ..
SUBDIR = sensors SUBDIR = sensors
EVENTSYS = @EVENTSYS@ EVENTSYS = @EVENTSYS@
ISMAINSITE = @TBMAINSITE@
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = slothd powermon nfstrace SUBDIRS = slothd powermon
ifeq ($(ISMAINSITE),1)
SUBDIRS += nfstrace
endif
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group. # Copyright (c) 2006, 2007, 2009 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
use English; use English;
...@@ -29,16 +29,6 @@ sub TableChanged($$) ...@@ -29,16 +29,6 @@ sub TableChanged($$)
return $describe_result->numrows; return $describe_result->numrows;
} }
sub NNewUUID()
{
my $uuid = `/usr/bin/uuidgen`;
if ($uuid =~ /^(\w{8}\-\w{4}\-\w{4}\-\w{4}\-\w{12})$/) {
return $1;
}
return undef;
}
# users # users
DBQueryFatal("lock tables users write, user_stats write"); DBQueryFatal("lock tables users write, user_stats write");
if (! TableChanged("users", "uid_uuid")) { if (! TableChanged("users", "uid_uuid")) {
...@@ -54,7 +44,7 @@ if (! TableChanged("user_stats", "uid_uuid")) { ...@@ -54,7 +44,7 @@ if (! TableChanged("user_stats", "uid_uuid")) {
my $query_result = DBQueryFatal("select uid_idx from users ". my $query_result = DBQueryFatal("select uid_idx from users ".
"where uid_uuid=''"); "where uid_uuid=''");
while (my ($uid_idx) = $query_result->fetchrow_array()) { while (my ($uid_idx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -68,7 +58,7 @@ while (my ($uid_idx) = $query_result->fetchrow_array()) { ...@@ -68,7 +58,7 @@ while (my ($uid_idx) = $query_result->fetchrow_array()) {
$query_result = DBQueryFatal("select uid_idx from user_stats ". $query_result = DBQueryFatal("select uid_idx from user_stats ".
"where uid_uuid=''"); "where uid_uuid=''");
while (my ($uid_idx) = $query_result->fetchrow_array()) { while (my ($uid_idx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -95,7 +85,7 @@ if (! TableChanged("group_stats", "gid_uuid")) { ...@@ -95,7 +85,7 @@ if (! TableChanged("group_stats", "gid_uuid")) {
$query_result = DBQueryFatal("select gid_idx from groups ". $query_result = DBQueryFatal("select gid_idx from groups ".
"where gid_uuid=''"); "where gid_uuid=''");
while (my ($gid_idx) = $query_result->fetchrow_array()) { while (my ($gid_idx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -110,7 +100,7 @@ while (my ($gid_idx) = $query_result->fetchrow_array()) { ...@@ -110,7 +100,7 @@ while (my ($gid_idx) = $query_result->fetchrow_array()) {
$query_result = DBQueryFatal("select gid_idx from group_stats ". $query_result = DBQueryFatal("select gid_idx from group_stats ".
"where gid_uuid=''"); "where gid_uuid=''");
while (my ($gid_idx) = $query_result->fetchrow_array()) { while (my ($gid_idx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -137,7 +127,7 @@ if (! TableChanged("experiment_stats", "eid_uuid")) { ...@@ -137,7 +127,7 @@ if (! TableChanged("experiment_stats", "eid_uuid")) {
$query_result = DBQueryFatal("select idx from experiments ". $query_result = DBQueryFatal("select idx from experiments ".
"where eid_uuid=''"); "where eid_uuid=''");
while (my ($exptidx) = $query_result->fetchrow_array()) { while (my ($exptidx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -152,7 +142,7 @@ while (my ($exptidx) = $query_result->fetchrow_array()) { ...@@ -152,7 +142,7 @@ while (my ($exptidx) = $query_result->fetchrow_array()) {
$query_result = DBQueryFatal("select exptidx from experiment_stats ". $query_result = DBQueryFatal("select exptidx from experiment_stats ".
"where eid_uuid=''"); "where eid_uuid=''");
while (my ($exptidx) = $query_result->fetchrow_array()) { while (my ($exptidx) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -173,7 +163,7 @@ if (! TableChanged("images", "uuid")) { ...@@ -173,7 +163,7 @@ if (! TableChanged("images", "uuid")) {
} }
$query_result = DBQueryFatal("select imageid from images where uuid=''"); $query_result = DBQueryFatal("select imageid from images where uuid=''");
while (my ($imageid) = $query_result->fetchrow_array()) { while (my ($imageid) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
...@@ -194,7 +184,7 @@ if (! TableChanged("os_info", "uuid")) { ...@@ -194,7 +184,7 @@ if (! TableChanged("os_info", "uuid")) {
} }
$query_result = DBQueryFatal("select osid from os_info where uuid=''"); $query_result = DBQueryFatal("select osid from os_info where uuid=''");
while (my ($osid) = $query_result->fetchrow_array()) { while (my ($osid) = $query_result->fetchrow_array()) {
my $uuid = NNewUUID(); my $uuid = NewUUID();
if (!defined($uuid)) { if (!defined($uuid)) {
die("*** $0:\n". die("*** $0:\n".
......
...@@ -11,11 +11,15 @@ SUBDIR = tbsetup ...@@ -11,11 +11,15 @@ SUBDIR = tbsetup
UNIFIED = @UNIFIED_BOSS_AND_OPS@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
PLABSUPPORT = @PLABSUPPORT@ PLABSUPPORT = @PLABSUPPORT@
ISMAINSITE = @TBMAINSITE@ ISMAINSITE = @TBMAINSITE@
NSVERIFY = @NSVERIFY@
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = checkpass ns2ir nsverify nseparse checkup template_cvsroot SUBDIRS = checkpass ns2ir nseparse checkup template_cvsroot