diff options
Diffstat (limited to 'client/deps')
| -rwxr-xr-x | client/deps/boottool/boottool.py | 20 | ||||
| -rwxr-xr-x | client/deps/libaio/libaio.py | 12 | ||||
| -rwxr-xr-x | client/deps/libnet/libnet.py | 24 | ||||
| -rwxr-xr-x | client/deps/mysql/mysql.py | 50 | ||||
| -rwxr-xr-x | client/deps/pgpool/pgpool.py | 32 | ||||
| -rwxr-xr-x | client/deps/pgsql/pgsql.py | 24 |
6 files changed, 81 insertions, 81 deletions
diff --git a/client/deps/boottool/boottool.py b/client/deps/boottool/boottool.py index e8013571..43e5cb22 100755 --- a/client/deps/boottool/boottool.py +++ b/client/deps/boottool/boottool.py @@ -7,21 +7,21 @@ from autotest_lib.client.common_lib import utils from autotest_lib.client.bin import autotest_utils # To use this, you have to set PERL5LIB to: -# autodir+'deps/boottool/lib/perl' +# autodir+'deps/boottool/lib/perl' # or on Ubuntu we also need -# autodir+'deps/boottool/share/perl' +# autodir+'deps/boottool/share/perl' # because it uses nonstandard locations version = 1 -def setup(tarball, topdir): - srcdir = os.path.join(topdir, 'src') - autotest_utils.extract_tarball_to_dir(tarball, srcdir) - os.chdir(srcdir) - utils.system ('perl Makefile.PL PREFIX=' + topdir) - utils.system ('make') - utils.system ('make install') - os.chdir(topdir) +def setup(tarball, topdir): + srcdir = os.path.join(topdir, 'src') + autotest_utils.extract_tarball_to_dir(tarball, srcdir) + os.chdir(srcdir) + utils.system ('perl Makefile.PL PREFIX=' + topdir) + utils.system ('make') + utils.system ('make install') + os.chdir(topdir) pwd = os.getcwd() diff --git a/client/deps/libaio/libaio.py b/client/deps/libaio/libaio.py index cfb037d3..e6736787 100755 --- a/client/deps/libaio/libaio.py +++ b/client/deps/libaio/libaio.py @@ -9,12 +9,12 @@ from autotest_lib.client.bin import autotest_utils version = 1 def setup(tarball, topdir): - srcdir = os.path.join(topdir, 'src') - autotest_utils.extract_tarball_to_dir(tarball, srcdir) - os.chdir(srcdir) - utils.system ('make') - utils.system ('make prefix=%s install' % topdir) - os.chdir(topdir) + srcdir = os.path.join(topdir, 'src') + autotest_utils.extract_tarball_to_dir(tarball, srcdir) + os.chdir(srcdir) + utils.system ('make') + utils.system ('make prefix=%s install' % topdir) + os.chdir(topdir) # old source was diff --git a/client/deps/libnet/libnet.py b/client/deps/libnet/libnet.py index eac66b25..90ab0238 100755 --- a/client/deps/libnet/libnet.py +++ b/client/deps/libnet/libnet.py @@ -8,19 +8,19 @@ from autotest_lib.client.bin import autotest_utils version = 1 -def setup(tarball, topdir): - srcdir = os.path.join(topdir, 'src') - if not os.path.exists(tarball): - utils.get_file('http://www.packetfactory.net/libnet/dist/libnet.tar.gz', - tarball) - autotest_utils.extract_tarball_to_dir(tarball, 'src') - os.chdir(srcdir) - utils.system ('./configure --prefix=%s/libnet' % topdir) - utils.system('make') - utils.system('make install') +def setup(tarball, topdir): + srcdir = os.path.join(topdir, 'src') + if not os.path.exists(tarball): + utils.get_file('http://www.packetfactory.net/libnet/dist/libnet.tar.gz', + tarball) + autotest_utils.extract_tarball_to_dir(tarball, 'src') + os.chdir(srcdir) + utils.system ('./configure --prefix=%s/libnet' % topdir) + utils.system('make') + utils.system('make install') + + os.chdir(topdir) - os.chdir(topdir) - pwd = os.getcwd() tarball = os.path.join(pwd, 'libnet.tar.gz') utils.update_version(pwd+'/src', False, version, setup, tarball, pwd) diff --git a/client/deps/mysql/mysql.py b/client/deps/mysql/mysql.py index 0fafe271..9a9eeb67 100755 --- a/client/deps/mysql/mysql.py +++ b/client/deps/mysql/mysql.py @@ -8,32 +8,32 @@ from autotest_lib.client.bin import autotest_utils version = 3 -def setup(tarball, topdir): - srcdir = os.path.join(topdir, 'src') - if not os.path.exists(tarball): - utils.get_file('http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-5.0.45.tar.gz', tarball) - autotest_utils.extract_tarball_to_dir(tarball, 'src') - os.chdir(srcdir) - utils.system ('./configure --prefix=%s/mysql --enable-thread-safe-client' \ - % topdir) - utils.system('make -j %d' % count_cpus()) - utils.system('make install') +def setup(tarball, topdir): + srcdir = os.path.join(topdir, 'src') + if not os.path.exists(tarball): + utils.get_file('http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-5.0.45.tar.gz', tarball) + autotest_utils.extract_tarball_to_dir(tarball, 'src') + os.chdir(srcdir) + utils.system ('./configure --prefix=%s/mysql --enable-thread-safe-client' \ + % topdir) + utils.system('make -j %d' % count_cpus()) + utils.system('make install') + + # + # MySQL doesn't create this directory on it's own. + # This is where database logs and files are created. + # + try: + os.mkdir(topdir + '/mysql/var') + except: + pass + # + # Initialize the database. + # + utils.system('%s/mysql/bin/mysql_install_db' % topdir) + + os.chdir(topdir) - # - # MySQL doesn't create this directory on it's own. - # This is where database logs and files are created. - # - try: - os.mkdir(topdir + '/mysql/var') - except: - pass - # - # Initialize the database. - # - utils.system('%s/mysql/bin/mysql_install_db' % topdir) - - os.chdir(topdir) - pwd = os.getcwd() tarball = os.path.join(pwd, 'mysql-5.0.45.tar.gz') utils.update_version(pwd+'/src', False, version, setup, tarball, pwd) diff --git a/client/deps/pgpool/pgpool.py b/client/deps/pgpool/pgpool.py index 3034b6af..24afc26f 100755 --- a/client/deps/pgpool/pgpool.py +++ b/client/deps/pgpool/pgpool.py @@ -8,23 +8,23 @@ from autotest_lib.client.bin import autotest_utils version = 1 -def setup(tarball, topdir): - # FIXME - Waiting to be able to specify dependency. - #self.job.setup_dep(['pgsql']) - srcdir = os.path.join(topdir, 'src') - if not os.path.exists(tarball): - utils.get_file('http://pgfoundry.org/frs/download.php/1083/pgpool-II-1.0.1.tar.gz', tarball) - autotest_utils.extract_tarball_to_dir(tarball, 'src') - os.chdir(srcdir) - # FIXEME - Waiting to be able to use self.autodir instead of - # os.environ['AUTODIR'] - utils.system('./configure --prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \ - % (topdir, os.environ['AUTODIR'])) - utils.system('make -j %d' % count_cpus()) - utils.system('make install') +def setup(tarball, topdir): + # FIXME - Waiting to be able to specify dependency. + #self.job.setup_dep(['pgsql']) + srcdir = os.path.join(topdir, 'src') + if not os.path.exists(tarball): + utils.get_file('http://pgfoundry.org/frs/download.php/1083/pgpool-II-1.0.1.tar.gz', tarball) + autotest_utils.extract_tarball_to_dir(tarball, 'src') + os.chdir(srcdir) + # FIXEME - Waiting to be able to use self.autodir instead of + # os.environ['AUTODIR'] + utils.system('./configure --prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \ + % (topdir, os.environ['AUTODIR'])) + utils.system('make -j %d' % count_cpus()) + utils.system('make install') + + os.chdir(topdir) - os.chdir(topdir) - pwd = os.getcwd() tarball = os.path.join(pwd, 'pgpool-II-1.0.1.tar.gz') utils.update_version(pwd+'/src', False, version, setup, tarball, pwd) diff --git a/client/deps/pgsql/pgsql.py b/client/deps/pgsql/pgsql.py index 1de96b8b..cd536534 100755 --- a/client/deps/pgsql/pgsql.py +++ b/client/deps/pgsql/pgsql.py @@ -8,18 +8,18 @@ from autotest_lib.client.bin import autotest_utils version = 4 -def setup(tarball, topdir): - srcdir = os.path.join(topdir, 'src') - if not os.path.exists(tarball): - utils.get_file('ftp://ftp.postgresql.org/pub/source/v8.3.1/postgresql-8.3.1.tar.bz2', tarball) - autotest_utils.extract_tarball_to_dir(tarball, 'src') - os.chdir(srcdir) - utils.system ('./configure --without-readline --without-zlib --enable-debug --prefix=%s/pgsql' % topdir) - utils.system('make -j %d' % count_cpus()) - utils.system('make install') - - os.chdir(topdir) - +def setup(tarball, topdir): + srcdir = os.path.join(topdir, 'src') + if not os.path.exists(tarball): + utils.get_file('ftp://ftp.postgresql.org/pub/source/v8.3.1/postgresql-8.3.1.tar.bz2', tarball) + autotest_utils.extract_tarball_to_dir(tarball, 'src') + os.chdir(srcdir) + utils.system ('./configure --without-readline --without-zlib --enable-debug --prefix=%s/pgsql' % topdir) + utils.system('make -j %d' % count_cpus()) + utils.system('make install') + + os.chdir(topdir) + pwd = os.getcwd() tarball = os.path.join(pwd, 'postgresql-8.3.1.tar.bz2') utils.update_version(pwd+'/src', False, version, setup, tarball, pwd) |