All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit fa2dbfd9 authored by Mike Hibler's avatar Mike Hibler

Skip all the "missing dependency" phases for FBSD 10 and beyond.

We haven't had these problems in a long time and the setting of PHP_PORT
was causing me grief--could not make it work for both old (php-extensions)
and new (php56*) without major hassle.
parent 725cfe0e
......@@ -113,10 +113,8 @@ $PHP_PORT = "php4-extensions-1.0";
if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
$PHP_VERSION = 5;
# there is no longer an explict extensions package
if ($FBSD_MAJOR > 10 || ($FBSD_MAJOR == 10 && $FBSD_MINOR > 1)) {
$PHP_PORT = "php56-5.6.12";
} elsif ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0) {
$PHP_PORT = "php56-5.6.9";
if ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0) {
$PHP_PORT = "php56";
} elsif ($FBSD_MAJOR > 9 || ($FBSD_MAJOR == 9 && $FBSD_MINOR > 1)) {
$PHP_PORT = "php5-extensions-1.7";
} elsif ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
......
......@@ -22,6 +22,12 @@ sub Install($$$)
}
AddPackage($BOSS_PORT, $packagedir);
};
# XXX haven't had dependency issues in a long time, skip these
if ($FBSD_MAJOR >= 10) {
PhaseSkip("Packages installed");
}
if ($FBSD_MAJOR > 4) {
Phase "php", "Installing php${PHP_VERSION} package", sub {
DoneIfPackageInstalled($PHP_PORT, 1);
......@@ -119,18 +125,18 @@ sub Install($$$)
AddPackage($pname, $packagedir);
}
}
if ($PGENISUPPORT) {
Phase "protogeni", "Installing protogeni packages", sub {
if ($FBSD_MAJOR > 6 || ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2)) {
DoneIfPackageInstalled("emulab-protogeni", 0);
my $pname = GetPackage("emulab-protogeni", $packagedir);
AddPackage($pname, $packagedir);
} else {
PhaseSkip("OS install too old for Protogeni");
}
};
}
};
if ($PGENISUPPORT) {
Phase "protogeni", "Installing protogeni packages", sub {
if ($FBSD_MAJOR > 6 || ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2)) {
DoneIfPackageInstalled("emulab-protogeni", 0);
my $pname = GetPackage("emulab-protogeni", $packagedir);
AddPackage($pname, $packagedir);
} else {
PhaseSkip("OS install too old for Protogeni");
}
};
}
if (ISFS($server)) {
Phase "fs-packages", "Installing FS packages", sub {
DoneIfPackageInstalled($FS_PORT, 1);
......
......@@ -22,6 +22,12 @@ sub Install($$$)
}
AddPackage($OPS_PORT, $packagedir);
};
# XXX haven't had dependency issues in a long time, skip these
if ($FBSD_MAJOR >= 10) {
PhaseSkip("Packages installed");
}
if ($FBSD_MAJOR > 4) {
Phase "php", "Installing php${PHP_VERSION} package", sub {
DoneIfPackageInstalled($PHP_PORT, 1);
......
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