Commit 48df4dac authored by Mike Hibler's avatar Mike Hibler
Browse files

Integrate loading of protogeni package.

Also, further reorg of rc.mkelab as I stuble my way toward a reasonable
organization.
parent b08bd2b4
......@@ -29,6 +29,7 @@ my $WINSUPPORT = @WINSUPPORT@;
my $MAILMANSUPPORT = @MAILMANSUPPORT@;
my $BUGDBSUPPORT = @BUGDBSUPPORT@;
my $ARCHSUPPORT = @ARCHIVESUPPORT@;
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $OURDOMAIN = '@OURDOMAIN@';
my $EXPOSETEMPLATES = $ELABINELAB;
......@@ -545,6 +546,19 @@ Phase "ports", "Installing ports", sub {
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
}
}
if ($PGENISUPPORT) {
Phase "protogeni", "Installing protogeni packages", sub {
if ($FBSD_MAJOR > 6 || ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2)) {
if (!ExecQuiet("$PKG_INFO -x emulab-protogeni")) {
PhaseSkip("Protogeni package already installed");
}
my $pname = GetPackage("emulab-protogeni", $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
} else {
PhaseSkip("OS install too old for Protogeni");
}
};
}
};
PhaseSkip("Package directory provided; not installing from sources")
if ($packagedir);
......@@ -567,6 +581,8 @@ Phase "ports", "Installing ports", sub {
"interactive. Run: \n" .
" cd $PORTSMISCDIR/emulab-boss && make install\n" .
" cd $PORTSMISCDIR/emulab-php4 && make install\n" .
($PGENISUPPORT ?
" cd $PORTSMISCDIR/emulab-protogeni && make install\n" : "") .
"then re-run this script.");
};
......
......@@ -8,12 +8,16 @@ OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/
PORTNAME= emulab-clrhouse
.if ${OSMAJOR} >= 6
.if ${OSMAJOR} > 6
PORTVERSION= 1.2
.else
.if ${OSMINOR} >= 3
PORTVERSION= 1.1
.else
PORTVERSION= 1.0
.endif
.endif
.endif
CATEGORIES= misc
MASTER_SITES= #none
DISTFILES= #none
......@@ -31,6 +35,9 @@ MAINTAINER= stoller@cs.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${PORTVERSION} == "1.2"
.MAKEFLAGS+= PERL_VERSION=5.10.0 PERL_VER=5.10.0 PERL_ARCH=mach
.endif
#
# For SWIG, so that it doesn't feel the need to suck in php and apache
......@@ -66,7 +73,7 @@ LIB_DEPENDS= mhash.2:${PORTSDIR}/security/mhash \
RUN_DEPENDS= \
${LOCALBASE}/etc/apache/ssl.crl:${PORTSDIR}/www/apache13-modssl \
${LOCALBASE}/libexec/apache/libauth_mysql.so:${PORTSDIR}/www/mod_auth_mysql \
mod_auth_mysql>1:${PORTSDIR}/www/mod_auth_mysql \
${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/misc/emulab-php4 \
rsync:${PORTSDIR}/net/rsync \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server \
......@@ -78,11 +85,20 @@ RUN_DEPENDS= \
wget:${PORTSDIR}/ftp/wget \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/XML.pm:${PORTSDIR}/net/p5-RPC-XML \
${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto \
gmake:${PORTSDIR}/devel/gmake \
${PYTHON_SITELIBDIR}/MySQLdb/times.py:${PORTSDIR}/databases/py-MySQLdb \
mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts
.if ${PORTVERSION} == "1.2"
# must handle patching of m2crypto when the port is built
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/misc/emulab-py-m2crypto
.else
# for older version we can patch the standard m2crypto once installed
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto
.endif
RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
......@@ -91,9 +107,9 @@ RUN_DEPENDS+= \
RUN_DEPENDS+= \
${LOCALBASE}/lib/libxml2.so:${PORTSDIR}/textproc/libxml2 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
xmlsec1:${PORTSDIR}/security/xmlsec1 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay
USE_PERL5= yes
USE_PYTHON= yes
......
This diff is collapsed.
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