Commit 97883e12 authored by Mike Hibler's avatar Mike Hibler

Tweaks for just released FreeBSD 10.2.

parent 0feaf751
...@@ -652,7 +652,7 @@ sub doboot() ...@@ -652,7 +652,7 @@ sub doboot()
$emulabconfig{BOSS_PKG} = "emulab-boss-6.0"; $emulabconfig{BOSS_PKG} = "emulab-boss-6.0";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.0-packages${suf}.tar.gz"; $emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.0-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-4.0"; $emulabconfig{PGENI_PKG} = "emulab-protogeni-4.0";
} elsif ($FBSD_VERSION >= 10.1) { } elsif ($FBSD_VERSION == 10.1) {
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : ""; my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/10.1/packages${suf}"; $emulabconfig{FS_PKG_DIR} = "/share/freebsd/10.1/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR}; $emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
...@@ -664,6 +664,18 @@ sub doboot() ...@@ -664,6 +664,18 @@ sub doboot()
$emulabconfig{EXTRA_PKG} = "emulab-extras-6.1"; $emulabconfig{EXTRA_PKG} = "emulab-extras-6.1";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.1-packages${suf}.tar.gz"; $emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.1-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-6.1"; $emulabconfig{PGENI_PKG} = "emulab-protogeni-6.1";
} elsif ($FBSD_VERSION >= 10.2) {
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/10.2/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{EXTRA_PKG_DIR}= $emulabconfig{FS_PKG_DIR};
$emulabconfig{FS_PKG} = "emulab-fs-6.2";
$emulabconfig{OPS_PKG} = "emulab-ops-6.2";
$emulabconfig{BOSS_PKG} = "emulab-boss-6.2";
$emulabconfig{EXTRA_PKG} = "emulab-extras-6.2";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.2-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-6.2";
} }
# #
# If there is a package tarball, prefer that and grab it now. # If there is a package tarball, prefer that and grab it now.
......
...@@ -64,7 +64,11 @@ $BOSS_PORT = "emulab-boss-1.8"; ...@@ -64,7 +64,11 @@ $BOSS_PORT = "emulab-boss-1.8";
$OPS_PORT = "emulab-ops-1.4"; $OPS_PORT = "emulab-ops-1.4";
$FS_PORT = "emulab-fs-1.4"; $FS_PORT = "emulab-fs-1.4";
if ($FBSD_MAJOR > 4) { if ($FBSD_MAJOR > 4) {
if ($FBSD_MAJOR > 10 || ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0)) { if ($FBSD_MAJOR > 10 || ($FBSD_MAJOR == 10 && $FBSD_MINOR > 1)) {
$BOSS_PORT = "emulab-boss-6.2";
$OPS_PORT = "emulab-ops-6.2";
$FS_PORT = "emulab-fs-6.2";
} elsif ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0) {
$BOSS_PORT = "emulab-boss-6.1"; $BOSS_PORT = "emulab-boss-6.1";
$OPS_PORT = "emulab-ops-6.1"; $OPS_PORT = "emulab-ops-6.1";
$FS_PORT = "emulab-fs-6.1"; $FS_PORT = "emulab-fs-6.1";
...@@ -109,7 +113,9 @@ $PHP_PORT = "php4-extensions-1.0"; ...@@ -109,7 +113,9 @@ $PHP_PORT = "php4-extensions-1.0";
if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) { if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
$PHP_VERSION = 5; $PHP_VERSION = 5;
# there is no longer an explict extensions package # there is no longer an explict extensions package
if ($FBSD_MAJOR > 10 || ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0)) { if ($FBSD_MAJOR > 10 || ($FBSD_MAJOR == 10 && $FBSD_MINOR > 1)) {
$PHP_PORT = "php56-5.6.11";
} elsif ($FBSD_MAJOR == 10 && $FBSD_MINOR > 0) {
$PHP_PORT = "php56-5.6.9"; $PHP_PORT = "php56-5.6.9";
} elsif ($FBSD_MAJOR > 9 || ($FBSD_MAJOR == 9 && $FBSD_MINOR > 1)) { } elsif ($FBSD_MAJOR > 9 || ($FBSD_MAJOR == 9 && $FBSD_MINOR > 1)) {
$PHP_PORT = "php5-extensions-1.7"; $PHP_PORT = "php5-extensions-1.7";
......
...@@ -9,21 +9,23 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//' ...@@ -9,21 +9,23 @@ 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/'
OSARCH != /usr/bin/uname -m OSARCH != /usr/bin/uname -m
EMULAB_PORTVERSION= UNSUPPORTED
.if ${OSMAJOR} >= 10 .if ${OSMAJOR} >= 10
. if ${OSMINOR} >= 1 . if ${OSMINOR} >= 2
EMULAB_PORTVERSION= 6.1 EMULAB_PORTVERSION= 6.2
. else . else
EMULAB_PORTVERSION= UNSUPPORTED . if ${OSMINOR} >= 1
EMULAB_PORTVERSION= 6.1
. endif
. endif . endif
.else
EMULAB_PORTVERSION= UNSUPPORTED
.endif .endif
# #
# Select PHP and Apache versions # Select PHP and Apache versions
# Fix up some port diffs # Fix up some port diffs
# #
.if ${EMULAB_PORTVERSION} == "6.1" .if ${EMULAB_PORTVERSION} != "UNSUPPORTED"
DEFAULT_VERSIONS= perl5=5.20 python=2.7 tcltk=8.6 php=5.6 mysql=5.5 apache=2.2 DEFAULT_VERSIONS= perl5=5.20 python=2.7 tcltk=8.6 php=5.6 mysql=5.5 apache=2.2
APACHE_PORT=www/apache22 APACHE_PORT=www/apache22
MYSQL_VER=55 MYSQL_VER=55
......
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