]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Enable additional features in hammer.py for RHEL8
authormanu <manu@isc.org>
Fri, 13 May 2022 07:24:28 +0000 (09:24 +0200)
committerWlodzimierz Wencel <wlodek@isc.org>
Wed, 18 May 2022 15:28:28 +0000 (15:28 +0000)
hammer.py

index c4e3e9df57ef6f5bacf5ac93b1e38a624d7431d7..0ed3ff16f13bc4627509a3c55aa20f9268b3d223 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1544,7 +1544,7 @@ def prepare_system_local(features, check_times):
                     'libtool', 'log4cplus-devel', 'make', 'mariadb-devel',
                     'openssl-devel', 'postgresql-devel']
 
-        if revision == '7':
+        if revision in ['7', '8']:
             # Install newer version of Boost in case users want to opt-in with:
             # --with-boost-include=/usr/include/boost169 --with-boost-lib-dir=/usr/lib64/boost169
             packages.append('boost169-devel')
@@ -1552,15 +1552,21 @@ def prepare_system_local(features, check_times):
         if 'native-pkg' in features:
             packages.extend(['python3-devel', 'rpm-build'])
 
+        if 'docs' in features:
+            packages.extend(['python3-virtualenv'])
+
         if 'mysql' in features:
             packages.extend(['mariadb', 'mariadb-server', 'mariadb-devel'])
 
         if 'pgsql' in features:
-            packages.extend(['postgresql', 'libpq-devel', 'postgresql-server'])
+            packages.extend(['postgresql', 'libpq-devel', 'postgresql-server', 'postgresql-server-devel'])
 
         if 'radius' in features:
             packages.extend(['freeradius', 'git'])
 
+        if 'gssapi' in features:
+            packages.extend(['krb5-devel'])
+
         if 'ccache' in features:
             packages.extend(['ccache'])
 
@@ -1581,6 +1587,12 @@ def prepare_system_local(features, check_times):
 
         install_pkgs(packages, env=env, timeout=120, check_times=check_times)
 
+        if 'docs' in features:
+            execute('virtualenv-3 ~/venv',
+                    env=env, timeout=60, check_times=check_times)
+            execute('~/venv/bin/pip install sphinx sphinx-rtd-theme',
+                    env=env, timeout=120, check_times=check_times)
+
     # prepare ubuntu
     elif system == 'ubuntu':
         _apt_update(system, revision, env=env, check_times=check_times, attempts=3, sleep_time_after_attempt=10)