Commit b23a7298 authored by Leigh Stoller's avatar Leigh Stoller

Lets not do archives/subversion on 6.0 Emulab; no subversion port.

We are going to move to 6.1 soon anyway, I hope.
parent d559b8ca
......@@ -28,6 +28,7 @@ my $ELABINELAB = @ELABINELAB@;
my $WINSUPPORT = @WINSUPPORT@;
my $MAILMANSUPPORT = @MAILMANSUPPORT@;
my $BUGDBSUPPORT = @BUGDBSUPPORT@;
my $ARCHSUPPORT = @ARCHSUPPORT@;
my $OURDOMAIN = '@OURDOMAIN@';
my $EXPOSETEMPLATES = $ELABINELAB;
......@@ -417,13 +418,15 @@ Phase "portfixup", "Fixing up packages", sub {
my $pname = GetPackage("p5-XML-Simple", $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
Phase "Subversion", "Looking for Subversion", sub {
if (!ExecQuiet("$PKG_INFO -x subversion")) {
PhaseSkip("subversion already installed");
}
my $pname = GetPackage("subversion-python", $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
if ($ARCHSUPPORT) {
Phase "Subversion", "Looking for Subversion", sub {
if (!ExecQuiet("$PKG_INFO -x subversion")) {
PhaseSkip("subversion already installed");
}
my $pname = GetPackage("subversion-python", $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
}
}
if ($WINSUPPORT) {
Phase "gcc30", "Looking for GCC 3.0 and installing", sub {
......
......@@ -1565,7 +1565,7 @@ sub CreateDefsFile($)
last SWITCH;
};
/^ARCHSUPPORT$/ && do {
if ($FBSD_VERSION >= 6) {
if ($FBSD_VERSION >= 6.1) {
print OUTDEFS "ARCHSUPPORT=1\n";
}
else {
......
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