summaryrefslogtreecommitdiffstats
path: root/hammer.py
diff options
context:
space:
mode:
authorMichal Nowikowski <godfryd@isc.org>2019-08-07 07:17:49 +0200
committerMichal Nowikowski <godfryd@isc.org>2019-08-07 07:17:49 +0200
commitafbdc6d7034981950c372a2f0aaa43f6b4e59039 (patch)
tree237e7f9bee3bbb5ad47ba293dd4b6265a5a0b0ee /hammer.py
parenthammer: fixed problems with repo updated and missing args (diff)
downloadkea-afbdc6d7034981950c372a2f0aaa43f6b4e59039.tar.xz
kea-afbdc6d7034981950c372a2f0aaa43f6b4e59039.zip
hammer: added missing deps for sphinx (texlive) and fixed installing cassandra
Diffstat (limited to 'hammer.py')
-rwxr-xr-xhammer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/hammer.py b/hammer.py
index 8c44f44876..b846d03cd3 100755
--- a/hammer.py
+++ b/hammer.py
@@ -934,6 +934,8 @@ def _install_cassandra_deb(system, revision, env, check_times):
execute('wget -qO- https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add -',
env=env, check_times=check_times)
_apt_update(system, revision, env=env, check_times=check_times)
+ # ca-certificates-java needs to be installed first because it fails if installed together with cassandra
+ install_pkgs('ca-certificates-java', env=env, check_times=check_times)
install_pkgs('cassandra libuv1 pkgconf', env=env, check_times=check_times)
if not os.path.exists('/usr/include/cassandra.h'):
@@ -1158,7 +1160,7 @@ def prepare_system_local(features, check_times):
packages.append('googletest')
if 'docs' in features:
- packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme'])
+ packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme', 'texlive', 'texlive-latex-extra'])
if 'native-pkg' in features:
packages.extend(['build-essential', 'fakeroot', 'devscripts'])
@@ -1205,7 +1207,7 @@ def prepare_system_local(features, check_times):
if revision == '8':
packages.extend(['virtualenv'])
else:
- packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme'])
+ packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme', 'texlive', 'texlive-latex-extra'])
if revision == '9':
packages.extend(['texlive-generic-extra'])