Commit e9ed9bcd authored by Mike Hibler's avatar Mike Hibler

A couple of fixes to make a FreeBSD 6.3 install work.

We don't officially support this anymore, but the problems were minor:

mapper: use HAVE_XERCES to determine whether rspec v2 output is supported.
The symptom is that swapin will fail due to passing the unsupported 'f'
option to assign, but it just isn't going to work anyway without an XML
parser installed.

rc.mkelab: fix a broken version check that would lead to inner-boss
setup failure on a pre-FreeBSD7 machine.
parent 249bde95
......@@ -88,6 +88,7 @@ my $WRAPPER2 = "$TB/libexec/assign_wrapper2";
my $PTOPGEN = "$TB/libexec/ptopgen";
my $VTOPGEN = "$TB/bin/vtopgen";
my $NFREE = "$TB/bin/nfree";
my $XERCES = "@HAVE_XERCES@";
#
# Load the Testbed support stuff.
......@@ -194,7 +195,11 @@ if (defined($options{"c"})) {
$clear = 1;
}
if (defined($options{"l"})) {
$userspec = 1;
if ($XERCES) {
$userspec = 1;
} else {
fatal("Rspec v2 support requires that Xerces be installed");
}
}
if (defined($options{"z"})) {
$randomize = 1;
......@@ -575,10 +580,12 @@ sub RunAssign($$)
$cmd .= "-new"
if ($newassign);
my $args = "";
$args .= "-f rspec "
if ($userspec == 1);
$args .= "-f text "
if ($userspec == 0);
if ($XERCES) {
$args .= "-f rspec "
if ($userspec == 1);
$args .= "-f text "
if ($userspec == 0);
}
$args .= "$ptopfile $vtopfile";
$args = "-P $args"
if (!$vtop->sharednodecount());
......
......@@ -1640,7 +1640,7 @@ sub SetupBossNode()
# See: http://www.freebsd.org/cgi/query-pr.cgi?pr=121257
#
my $tso = "";
if ($FBSD_VERSION > 6) {
if ($FBSD_VERSION >= 7) {
$tso = "-tso";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment