Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
a1e2eee7
Commit
a1e2eee7
authored
Dec 28, 2009
by
Mike Hibler
Browse files
Continued tweaks. Automated elabinelab ops-install now works.
parent
e0c213a8
Changes
8
Hide whitespace changes
Inline
Side-by-side
GNUmakefile.in
View file @
a1e2eee7
...
...
@@ -348,7 +348,7 @@ undo-configure:
elabinelab:
-mkdir -p $(INSTALL_TOPDIR)/src
rm -f $(INSTALL_TOPDIR)/src/emulab-src.tar.gz
tar czf $(INSTALL_TOPDIR)/src/emulab-src.tar.gz -C $(SRCDIR) .
tar czf $(INSTALL_TOPDIR)/src/emulab-src.tar.gz -C $(SRCDIR)
--exclude=.git
.
# How to recursively descend into subdirectories to make general
# targets such as `all'.
...
...
install/boss-install.in
View file @
a1e2eee7
...
...
@@ -561,7 +561,7 @@ Phase "portfixup", "Fixing up packages", sub {
my
$pname
=
GetPackage
("
rsync
",
$packagedir
);
ExecQuietFatal
("
$ENV
PKG_PATH=
$packagedir
$PKG_ADD
$pname
");
};
if
(
$FBSD_MAJOR
=
=
6
)
{
if
(
$FBSD_MAJOR
>
=
6
)
{
# Temporary for template stuff
Phase
"
Simple
",
"
Looking for Simple XML Parser
",
sub
{
if
(
!
ExecQuiet
("
$PKG_INFO
-x p5-XML-Simple
"))
{
...
...
@@ -575,7 +575,12 @@ Phase "portfixup", "Fixing up packages", sub {
if
(
!
ExecQuiet
("
$PKG_INFO
-x subversion
"))
{
PhaseSkip
("
subversion already installed
");
}
my
$pname
=
GetPackage
("
subversion-python
",
$packagedir
);
my
$pname
;
if
(
$FBSD_MAJOR
>
6
)
{
$pname
=
GetPackage
("
py-subversion
",
$packagedir
);
}
else
{
$pname
=
GetPackage
("
subversion-python
",
$packagedir
);
}
ExecQuietFatal
("
$ENV
PKG_PATH=
$packagedir
$PKG_ADD
$pname
");
};
}
...
...
@@ -584,7 +589,7 @@ Phase "portfixup", "Fixing up packages", sub {
Phase
"
gcc30
",
"
Looking for GCC 3.0 and installing
",
sub
{
if
(
$FBSD_MAJOR
>
4
||
!
ExecQuiet
("
$PKG_INFO
-x gcc30
"))
{
PhaseSkip
("
GCC 3.0 already installed
");
PhaseSkip
("
GCC 3.0
or greater
already installed
");
}
my
$pname
=
GetPackage
("
gcc30
",
$packagedir
);
ExecQuietFatal
("
$ENV
PKG_PATH=
$packagedir
$PKG_ADD
$pname
");
...
...
@@ -1214,7 +1219,7 @@ Phase "sslcerts", "Setting up SSL certificates", sub {
};
Phase
"
rc.d
",
"
Installing Apache startup file
",
sub
{
DoneIfExists
("
$RCDIR
/apache.sh
");
my
$sfile
my
$sfile
;
if
(
$FBSD_MAJOR
>
6
)
{
$sfile
=
"
$RCDIR
/apache
";
}
else
{
...
...
install/fs-install.in
View file @
a1e2eee7
...
...
@@ -84,7 +84,9 @@ else {
#
my
$FS_PORT
=
"
emulab-fs-1.4
";
if
(
$FBSD_MAJOR
>
4
)
{
if
(
$FBSD_MAJOR
==
6
&&
$FBSD_MINOR
>
2
)
{
if
(
$FBSD_MAJOR
>
6
)
{
$FS_PORT
=
"
emulab-fs-3.0
";
}
elsif
(
$FBSD_MAJOR
==
6
&&
$FBSD_MINOR
>
2
)
{
$FS_PORT
=
"
emulab-fs-2.1
";
}
else
{
$FS_PORT
=
"
emulab-fs-2.0
";
...
...
install/ops-install.in
View file @
a1e2eee7
...
...
@@ -528,7 +528,7 @@ Phase "portfixup", "Fixing up packages", sub {
Phase
"
gcc30
",
"
Looking for GCC 3.0 and installing
",
sub
{
if
(
$FBSD_MAJOR
>
4
||
!
ExecQuiet
("
$PKG_INFO
-x gcc30
"))
{
PhaseSkip
("
GCC 3.0 already installed
");
PhaseSkip
("
GCC 3.0
or greater
already installed
");
}
my
$pname
=
GetPackage
("
gcc30
",
$packagedir
);
ExecQuietFatal
("
$ENV
PKG_PATH=
$packagedir
$PKG_ADD
$pname
");
...
...
@@ -1251,9 +1251,9 @@ if ($CVSSUPPORT) {
};
Phase
"
cvsd.sh
",
"
Installing cvsd.sh
",
sub
{
# FBSD 6.3
package
should install this in place
DoneIfExists
("
$RCDIR
/cvsd
")
if
(
$FBSD_MINOR
>
2
);
# FBSD 6.3
and beyond
should install this in place
DoneIfExists
("
$RCDIR
/cvsd
")
;
DoneIfExists
("
$RCDIR
/cvsd.sh
");
ExecQuietFatal
("
mv
$RCDIR
/cvsd.sh.sample
$RCDIR
/cvsd.sh
");
ExecQuietFatal
("
$CHMOD
a+x
$RCDIR
/cvsd.sh
");
...
...
install/ports/emulab-boss/Makefile
View file @
a1e2eee7
...
...
@@ -39,7 +39,7 @@ MAINTAINER= ricci@cs.utah.edu
#
.MAKEFLAGS
+=
ENABLE_SUIDPERL
=
yes
.if
${PORTVERSION}
==
"3.0"
.MAKEFLAGS
+=
PERL_VERSION
=
5.10.0
.MAKEFLAGS
+=
PERL_VERSION
=
5.10.0
PERL_VER
=
5.10.0
PERL_ARCH
=
mach
.
endif
#
...
...
@@ -101,7 +101,7 @@ LIB_DEPENDS+= pubsub.1:${PORTSDIR}/misc/emulab-pubsub
RUN_DEPENDS
=
\
${LOCALBASE}
/etc/apache/ssl.crl:
${PORTSDIR}
/www/apache13-modssl
\
${LOCALBASE}
/libexec/apache/lib
auth_mysql
.so
:
${PORTSDIR}
/www/mod_auth_mysql
\
mod_
auth_mysql
>1
:
${PORTSDIR}
/www/mod_auth_mysql
\
fping:
${PORTSDIR}
/net/fping
\
rsync:
${PORTSDIR}
/net/rsync
\
neato:
${PORTSDIR}
/graphics/graphviz
\
...
...
@@ -124,7 +124,7 @@ 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
\
${PYTHON_
PKGNAMEPREFIX}
m2crypto>0
:
${PORTSDIR}
/security/py-m2crypto
\
gmake:
${PORTSDIR}
/devel/gmake
\
kmetis:
${PORTSDIR}
/math/metis
\
curl:
${PORTSDIR}
/ftp/curl
\
...
...
install/ports/emulab-fs/Makefile
View file @
a1e2eee7
...
...
@@ -36,6 +36,9 @@ MAINTAINER= hibler@cs.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS
+=
ENABLE_SUIDPERL
=
yes
.if
${PORTVERSION}
==
"3.0"
.MAKEFLAGS
+=
PERL_VERSION
=
5.10.0
PERL_VER
=
5.10.0
PERL_ARCH
=
mach
.
endif
#
# This prevents any ports from trying to run interactively - some, ask silly
...
...
@@ -45,17 +48,8 @@ MAINTAINER= hibler@cs.utah.edu
RUN_DEPENDS
=
gmake:
${PORTSDIR}
/devel/gmake
\
sudo
:
${PORTSDIR}
/security/sudo
\
rsync:
${PORTSDIR}
/net/rsync
.if
${OSMAJOR}
>=
6
.
else
RUN_DEPENDS
+=
smbd:
${PORTSDIR}
/net/samba3
.
endif
.if
${PORTVERSION}
==
"2.1"
# not sure why we don't build this for 6.0-6.2...
RUN_DEPENDS
+=
smbd:
${PORTSDIR}
/net/samba3
.
endif
rsync:
${PORTSDIR}
/net/rsync
\
smbd:
${PORTSDIR}
/net/samba3
NO_BUILD
=
yes
...
...
install/ports/emulab-ops/Makefile
View file @
a1e2eee7
...
...
@@ -37,6 +37,9 @@ MAINTAINER= ricci@cs.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS
+=
ENABLE_SUIDPERL
=
yes
.if
${PORTVERSION}
==
"3.0"
.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
...
...
@@ -71,7 +74,7 @@ MAINTAINER= ricci@cs.utah.edu
# XXX not really a build dependency, but needs to get installed before
# any attempt to install mysql50-* ports
#
.if
${PORTVERSION}
==
"2.1"
.if
(
${PORTVERSION}
==
"2.1"
||
${PORTVERSION}
==
"3.0"
)
BUILD_DEPENDS
=
\
${LOCALBASE}
/lib/perl5/site_perl/
${PERL_VER}
/
${PERL_ARCH}
/Mysql.pm:
${PORTSDIR}
/misc/p5-DBD-mysql50-old
.
else
...
...
@@ -101,7 +104,7 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
${LOCALBASE}
/lib/perl5/site_perl/
${PERL_VER}
/
${PERL_ARCH}
/BSD/Resource.pm:
${PORTSDIR}
/devel/p5-BSD-Resource
\
${LOCALBASE}
/lib/perl5/site_perl/
${PERL_VER}
/
${PERL_ARCH}
/Time/HiRes.pm:
${PORTSDIR}
/devel/p5-Time-HiRes
\
wget:
${PORTSDIR}
/ftp/wget
\
${PYTHON_
SITELIBDIR}
/M2Crypto/ASN1.py
:
${PORTSDIR}
/security/py-m2crypto
${PYTHON_
PKGNAMEPREFIX}
m2crypto>0
:
${PORTSDIR}
/security/py-m2crypto
.if
defined(ELVIN_COMPAT)
RUN_DEPENDS
+=
${LOCALBASE}
/libexec/elvind:
${PORTSDIR}
/misc/elvind
...
...
@@ -110,7 +113,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/elvind:${PORTSDIR}/misc/elvind
.if
${OSMAJOR}
>=
6
RUN_DEPENDS
+=
\
${LOCALBASE}
/etc/apache/ssl.crl:
${PORTSDIR}
/www/apache13-modssl
\
${LOCALBASE}
/libexec/apache/lib
auth_mysql
.so
:
${PORTSDIR}
/www/mod_auth_mysql
\
mod_
auth_mysql
>1
:
${PORTSDIR}
/www/mod_auth_mysql
\
${LOCALBASE}
/libexec/mysqld:
${PORTSDIR}
/databases/mysql50-server
\
${LOCALBASE}
/lib/perl5/site_perl/
${PERL_VER}
/
${PERL_ARCH}
/DBI.pm:
${PORTSDIR}
/databases/p5-DBI
\
${LOCALBASE}
/lib/perl5/site_perl/
${PERL_VER}
/
${PERL_ARCH}
/XML/Parser:
${PORTSDIR}
/textproc/p5-XML-Parser
\
...
...
@@ -128,11 +131,9 @@ RUN_DEPENDS+= \
RUN_DEPENDS
+=
smbd:
${PORTSDIR}
/net/samba3
.
endif
.if
${PORTVERSION}
==
"2.1"
.if
(
${PORTVERSION}
==
"2.1"
||
${PORTVERSION}
==
"3.0"
)
# not sure why this is just needed for 6.3
RUN_DEPENDS
+=
${X11BASE}
/libdata/xorg/libraries:
${PORTSDIR}
/x11/xorg-libraries
# not sure why we don't build this for 6.0-6.2...
RUN_DEPENDS
+=
smbd:
${PORTSDIR}
/net/samba3
.
endif
NO_BUILD
=
yes
...
...
@@ -142,4 +143,3 @@ USE_PERL5= yes
do-install
:
#
empty
.
include
<bsd.port.mk>
tmcd/common/config/rc.mkelab
View file @
a1e2eee7
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-200
8
University of Utah and the Flux Group.
# Copyright (c) 2004-200
9
University of Utah and the Flux Group.
# All rights reserved.
#
# XXX I hardwire IPs into generated /etc/rc.conf and /etc/rc.resolv.
...
...
@@ -343,6 +343,18 @@ sub doboot()
$emulabconfig
{
OPS_PKG
}
=
"
emulab-ops-2.1
";
$emulabconfig
{
BOSS_PKG
}
=
"
emulab-boss-2.1
";
}
elsif
(
$FBSD_VERSION
==
7.2
)
{
if
(
$ELVIN_COMPAT
)
{
$emulabconfig
{
FS_PKG_DIR
}
=
"
/share/freebsd/7.2/packages.elvincompat
";
}
else
{
$emulabconfig
{
FS_PKG_DIR
}
=
"
/share/freebsd/7.2/packages
";
}
$emulabconfig
{
OPS_PKG_DIR
}
=
$emulabconfig
{
FS_PKG_DIR
};
$emulabconfig
{
BOSS_PKG_DIR
}
=
$emulabconfig
{
FS_PKG_DIR
};
$emulabconfig
{
FS_PKG
}
=
"
emulab-fs-3.0
";
$emulabconfig
{
OPS_PKG
}
=
"
emulab-ops-3.0
";
$emulabconfig
{
BOSS_PKG
}
=
"
emulab-boss-3.0
";
}
# Figure out where /share is coming from (outer fs node). We need
# that below.
...
...
@@ -1812,6 +1824,15 @@ sub CreateDefsFile($)
print
OUTDEFS
"
ELVIN_COMPAT=
$ELVIN_COMPAT
\n
";
last
SWITCH
;
};
/^NSVERIFY$/
&&
do
{
# XXX cannot build full ns on FBSD7 yet
if
(
$FBSD_VERSION
>
6
)
{
print
OUTDEFS
"
NSVERIFY=0
\n
";
}
else
{
print
OUTDEFS
"
NSVERIFY=1
\n
";
}
last
SWITCH
;
};
print
OUTDEFS
$line
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment