Skip to content

GitLab

Commit d6196ab5 authored by Mike Hibler's avatar Mike Hibler
Browse files

Support FreeBSD 8.3 for boss/ops install. 

Uses the "5.0" package set (like FBSD 9.0, but unlike FBSD 8.2) which
includes perl 5.12, python 2.7 and apache 2.22. This is what will be
installed on our boss and ops later this month.

Some additional updates to the meta ports as well to make them "work better".
parent 4f885af1
Hide whitespace changes
Inline Side-by-side
clientside/tmcc/common/config/rc.mkelab
View file @ d6196ab5
......@@ -578,16 +578,15 @@ sub doboot()
$emulabconfig{BOSS_PKG} = "emulab-boss-3.0";
}
elsif ($FBSD_VERSION == 7.3) {
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/7.3/packages";
$emulabconfig{FS_PKG_DIR} .= "-64"
if ($FBSD_ARCH eq "amd64");
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/7.3/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{FS_PKG} = "emulab-fs-3.1";
$emulabconfig{OPS_PKG} = "emulab-ops-3.1";
$emulabconfig{BOSS_PKG} = "emulab-boss-3.1";
}
elsif ($FBSD_VERSION >= 8.2 && $FBSD_VERSION < 9.0) {
elsif ($FBSD_VERSION == 8.2) {
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/8.2/packages";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
......@@ -597,6 +596,17 @@ sub doboot()
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-8.2-packages.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-2.0";
}
elsif ($FBSD_VERSION >= 8.3 && $FBSD_VERSION < 9.0) {
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/8.3/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{FS_PKG} = "emulab-fs-5.0";
$emulabconfig{OPS_PKG} = "emulab-ops-5.0";
$emulabconfig{BOSS_PKG} = "emulab-boss-5.0";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-8.3-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-3.0";
}
elsif ($FBSD_VERSION >= 9.0) {
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/9.0/packages";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
......@@ -614,6 +624,7 @@ sub doboot()
#
# Grab the package tarball now.
# XXX note that we do not download into $TBDIR, it gets moved later.
#
mysystem("fetch -q -o /usr/packages.tar.gz ".
"'http://${bossname}/downloads/" .
......@@ -1029,8 +1040,20 @@ sub SetupFsNode()
print RC "nfs_server_enable=\"YES\"\n";
print RC "nfs_server_flags=\"-u -t -n 8\"\n";
print RC "nfs_client_enable=\"YES\"\n";
print RC "smbd_enable=\"YES\"\n"
if ($emulabconfig{"CONFIG_WINDOWS"});
if ($emulabconfig{"CONFIG_WINDOWS"}) {
#
# As of 10/2012, the startup for samba changed.
# XXX not directly related to the FreeBSD version, but it is
# the best we can do--the port version was not bumped when this
# change was made.
#
if ($FBSD_VERSION >= 8.3) {
print RC "samba_enable=\"YES\"\n";
print RC "nmbd_enable=\"NO\"\n";
} else {
print RC "smbd_enable=\"YES\"\n";
}
}
print RC "mountd_flags=\"-r -p 900\"\n";
print RC "network_interfaces=\"$outer_controlif\"\n";
......@@ -1430,8 +1453,8 @@ sub SetupOpsNode($)
system("pkg_delete -f -x emacs");
}
# XXX 8.2 image is out of sync right now
if ($FBSD_VERSION == 8.2) {
# XXX 8.x images have rpm-3 installed
if ($FBSD_VERSION == 8.2 || $FBSD_VERSION == 8.3) {
system("pkg_delete -f -x rpm-3");
}
......@@ -1707,7 +1730,7 @@ sub SetupOpsNode($)
if (exists($emulabconfig{"GENIRACK_TBOPS"})) {
$where .= "\n" . $emulabconfig{"GENIRACK_TBOPS"};
}
if ($list eq "testbed-logs" || $list eq "testbed-audit") {
if (exists($emulabconfig{"GENIRACK_TBLOGS"})) {
$where = $emulabconfig{"GENIRACK_TBLOGS"};
......@@ -2111,8 +2134,8 @@ sub SetupBossNode($)
system("pkg_delete -x net-snmp")
if (-e "/usr/local/include/net-snmp");
# XXX 8.2 image is out of sync right now
if ($FBSD_VERSION == 8.2) {
# XXX 8.x images have rpm-3 installed
if ($FBSD_VERSION == 8.2 || $FBSD_VERSION == 8.3) {
system("pkg_delete -f -x rpm-3");
}
......@@ -2738,8 +2761,8 @@ sub SetupOpsJail()
system("pkg_delete -r -x mysql-client")
if (-e "/usr/local/bin/mysql");
# XXX 8.2 image is out of sync right now
if ($FBSD_VERSION == 8.2) {
# XXX 8.x images have rpm-3 installed
if ($FBSD_VERSION == 8.2 || $FBSD_VERSION == 8.3) {
system("pkg_delete -f -x rpm-3");
}
......
install/installvars.pm.in
View file @ d6196ab5
......@@ -64,7 +64,7 @@ $BOSS_PORT = "emulab-boss-1.8";
$OPS_PORT = "emulab-ops-1.4";
$FS_PORT = "emulab-fs-1.4";
if ($FBSD_MAJOR > 4) {
if ($FBSD_MAJOR > 8) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
$BOSS_PORT = "emulab-boss-5.0";
$OPS_PORT = "emulab-ops-5.0";
$FS_PORT = "emulab-fs-5.0";
......@@ -96,7 +96,7 @@ $PHP_VERSION = 4;
$PHP_PORT = "php4-extensions-1.0";
if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
$PHP_VERSION = 5;
if ($FBSD_MAJOR > 8) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
$PHP_PORT = "php5-extensions-1.6";
} elsif ($FBSD_MAJOR > 7) {
$PHP_PORT = "php5-extensions-1.4";
......@@ -123,7 +123,7 @@ $SELFLOAD_PATCH = "$main::TOP_SRCDIR/patches/SelfLoader.patch";
#
$PYM2_PKG = "py25-m2crypto-0.19.1";
$PY_VER = "python2.5";
if ($FBSD_MAJOR > 8) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
$PYM2_PKG = "py27-m2crypto-0.21.1";
$PY_VER = "python2.7";
} elsif ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
......
install/ports/emulab-boss/Makefile
View file @ d6196ab5
......@@ -91,6 +91,9 @@ BUILD_DEPENDS= \
${LOCALBASE}/libexec/apache/libphp${PHP_VER}.so:${PORTSDIR}/misc/emulab-php${PHP_VER}
.endif
# XXX force our version of tcl early to prevent installing a newer version
BUILD_DEPENDS+= tclsh8.4:${PORTSDIR}/lang/tcl84
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
......@@ -135,7 +138,6 @@ RUN_DEPENDS+= \
swish-e:${PORTSDIR}/www/swish-e \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server \
anytopnm:${PORTSDIR}/graphics/netpbm \
tclsh8.4:${PORTSDIR}/lang/tcl84 \
otclsh:${PORTSDIR}/lang/otcl \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/${P5SNMP_PORT} \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
......@@ -243,7 +245,7 @@ RUN_DEPENDS+= \
# make sure these get installed
RUN_DEPENDS+= \
${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
${LOCALBASE}/bin/xauth:${PORTSDIR}/x11/xauth
USE_PERL5= yes
......
install/ports/emulab-boss/Makefile.emulab
View file @ d6196ab5
......@@ -11,28 +11,32 @@ OSARCH != /usr/bin/uname -m
.if ${OSMAJOR} > 8
EMULAB_PORTVERSION= 5.0
.else
.if ${OSMAJOR} > 7
. if (${OSMAJOR} > 7 && ${OSMINOR} >= 3)
EMULAB_PORTVERSION= 5.0
. else
. if ${OSMAJOR} > 7
EMULAB_PORTVERSION= 4.0
.else
. if ${OSMAJOR} > 6
. if ${OSMINOR} > 2
EMULAB_PORTVERSION= 3.1
. else
. if ${OSMAJOR} > 6
. if ${OSMINOR} > 2
EMULAB_PORTVERSION= 3.1
. else
EMULAB_PORTVERSION= 3.0
. endif
. else
. if ${OSMAJOR} > 5
. if ${OSMINOR} >= 3
EMULAB_PORTVERSION= 2.1
. endif
. else
. if ${OSMAJOR} > 5
. if ${OSMINOR} >= 3
EMULAB_PORTVERSION= 2.1
. else
EMULAB_PORTVERSION= 2.0
. endif
. else
. endif
. else
EMULAB_PORTVERSION= 1.7
. endif
. endif
. endif
. endif
.endif
.endif
#
# Select PHP and Apache versions
......
install/ports/emulab-extras/Makefile
View file @ d6196ab5
......@@ -18,12 +18,47 @@ NO_BUILD= yes
#
.MAKEFLAGS+= -DBATCH
RUN_DEPENDS+= \
#
# Emacs configuration options. Controls the worst of the excesses.
# I am reasonably confident that these options will not affect the
# other ports listed.
#
.MAKEFLAGS+= WITHOUT_DBUS=yes
.MAKEFLAGS+= WITHOUT_GCONF=yes
.MAKEFLAGS+= WITHOUT_GIF=yes
.MAKEFLAGS+= WITHOUT_GTK2=yes
.MAKEFLAGS+= WITH_JPEG=yes
.MAKEFLAGS+= WITHOUT_M17N=yes
.MAKEFLAGS+= WITHOUT_MOTIF=yes
.MAKEFLAGS+= WITHOUT_OTF=yes
.MAKEFLAGS+= WITHOUT_PNG=yes
.MAKEFLAGS+= WITHOUT_SOUND=yes
.MAKEFLAGS+= WITH_SOURCES=yes
.MAKEFLAGS+= WITHOUT_SVG=yes
.MAKEFLAGS+= WITHOUT_TIFF=yes
.MAKEFLAGS+= WITH_X11=yes
.MAKEFLAGS+= WITH_XAW=yes
.MAKEFLAGS+= WITHOUT_XAW3D=yes
.MAKEFLAGS+= WITH_SYNC_INPUT=yes
.MAKEFLAGS+= WITHOUT_SCROLLBARS=yes
.MAKEFLAGS+= WITHOUT_XFT=yes
.MAKEFLAGS+= WITHOUT_XIM=yes
.MAKEFLAGS+= WITHOUT_XPM=yes
# XXX do vim-lite to avoid dragging in gtk
RUN_DEPENDS= \
${LOCALBASE}/bin/jove:${PORTSDIR}/editors/jove \
${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs \
${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \
${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim-lite \
${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof \
${LOCALBASE}/bin/ttcp:${PORTSDIR}/benchmarks/ttcp
${LOCALBASE}/bin/ttcp:${PORTSDIR}/benchmarks/ttcp \
${LOCALBASE}/sbin/e2fsck:${PORTSDIR}/sysutils/e2fsprogs \
${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \
${PYTHON_SITELIBDIR}/svn/client.py:${PORTSDIR}/devel/py-subversion \
${LOCALBASE}/bin/xterm:${PORTSDIR}/x11/xterm \
${LOCALBASE}/sbin/portaudit:${PORTSDIR}/ports-mgmt/portaudit
USE_PYTHON= yes
do-install: # empty
......
install/ports/emulab-ops/Makefile
View file @ d6196ab5
......@@ -95,6 +95,9 @@ BUILD_DEPENDS= \
${LOCALBASE}/libexec/apache/libphp${PHP_VER}.so:${PORTSDIR}/misc/emulab-php${PHP_VER}
.endif
# XXX force our version of tcl early to prevent installing a newer version
BUILD_DEPENDS+= tclsh8.4:${PORTSDIR}/lang/tcl84
LIB_DEPENDS=
# no linuxthreads on amd64
......@@ -188,14 +191,15 @@ RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
curl:${PORTSDIR}/ftp/curl \
snort:${PORTSDIR}/security/snort \
mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts
mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts \
${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
.else
RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
.endif
# make sure these get installed
RUN_DEPENDS+= \
${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries
${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries
NO_BUILD= yes
USE_PYTHON= yes
......
install/ports/emulab-pubsub/Makefile
View file @ d6196ab5
# ports collection makefile for: emulab-pubsub
PORTNAME= pubsub
PORTVERSION= 0.95
PORTVERSION= 0.98
CATEGORIES= misc
MASTER_SITES= http://www.emulab.net/distributions/
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
......@@ -10,7 +10,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAINTAINER= testbed-ops@flux.utah.edu
COMMENT= "Simple publish subscribe system for Emulab"
MAKEFILE= GNUmakefile
USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
INSTALLS_SHLIB= yes
......
install/ports/emulab-pubsub/distinfo
View file @ d6196ab5
MD5 (pubsub-0.9.tar.gz) = 25216f20821bb7094a1853b1771cb5b8
MD5 (pubsub-0.95.tar.gz) = 9e012e65ebb4979e99f686e5f8fa8104
MD5 (pubsub-0.98.tar.gz) = e20d85edfb4232d6e918bd6cfceba75e
SHA256 (pubsub-0.95.tar.gz) = 7b8eb4f495a531454b16abb8e8399e031fa17a31e09c4ce47486cedaa3ae4410
SHA256 (pubsub-0.98.tar.gz) = 981f0c61919839c895edc9a2b4cdae792a7acecb6d215d8a2fde890f554bffe1
install/ports/p5-GD-old/Makefile
View file @ d6196ab5
......@@ -19,7 +19,7 @@ COMMENT= A perl5 interface to Gd Graphics Library version2
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
PERL_CONFIGURE= yes
CONFIGURE_ARGS= -options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
CONFIGURE_ARGS= -options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${LOCALBASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
MAN3= GD.3 GD::Polyline.3
......
Supports Markdown
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