From: Michal Nowikowski <godfryd@isc.org>
Date: Wed, 23 Jan 2019 10:26:33 +0000 (+0100)
Subject: hammer: various improvements
X-Git-Tag: 429-Updated-StampedValue-to-support-reals_base~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba2700e2f947d4b3cc43902b1f7f506b3c661a4;p=thirdparty%2Fkea.git

hammer: various improvements

- added sql script for mysql used on debian 9 to fix MariaDB issue
- added enabling kea-shell feature
- removed hack for detecting boost on FreeBSD as it is fixed in Kea now
---

diff --git a/hammer.py b/hammer.py
index c68749747e..09e955bd42 100755
--- a/hammer.py
+++ b/hammer.py
@@ -138,6 +138,8 @@ def get_system_revision():
         if system == 'debian':
             if revision.startswith('8.'):
                 revision = '8'
+            if revision.startswith('9.'):
+                revision = '9'
         elif system == 'redhat':
             system = 'rhel'
             if revision.startswith('8.'):
@@ -409,7 +411,7 @@ def _install_gtest_sources():
         os.unlink('/tmp/gtest.tar.gz')
 
 
-def _configure_mysql(system):
+def _configure_mysql(system, revision):
     if system in ['fedora', 'centos']:
         execute('sudo systemctl enable mariadb.service')
         execute('sudo systemctl start mariadb.service')
@@ -429,6 +431,19 @@ def _configure_mysql(system):
     cmd += "EOF\n\""
     execute(cmd)
 
+    log.info("FIX FOR ISSUE: %s %s", system, revision)
+    if system == 'debian' and revision == '9':
+        log.info("FIX FOR ISSUE 2: %s %s", system, revision)
+        # fix for issue: https://gitlab.isc.org/isc-projects/kea/issues/389
+        cmd = "bash -c \"cat <<EOF | sudo mysql -u root\n"
+        cmd += "use keatest;\n"
+        cmd += "set global innodb_large_prefix=on;\n"
+        cmd += "set global innodb_file_format=Barracuda;\n"
+        cmd += "set global innodb_file_per_table=true;\n"
+        cmd += "set global innodb_default_row_format=dynamic;\n"
+        cmd += "EOF\n\""
+        execute(cmd)
+
 
 def _configure_pgsql(system):
     if system in ['fedora', 'centos']:
@@ -683,7 +698,7 @@ def prepare_deps_local(features, check_times):
         raise NotImplementedError
 
     if 'mysql' in features:
-        _configure_mysql(system)
+        _configure_mysql(system, revision)
 
     if 'pgsql' in features:
         _configure_pgsql(system)
@@ -788,10 +803,8 @@ def build_local(features, tarball_path, check_times, jobs):
             cmd += ' --enable-generate-docs'
         if 'radius' in features:
             cmd += ' --with-freeradius=/usr/local'
-
-        if distro == 'freebsd':
-            cmd += ' --with-boost-include=/usr/local/include'  # TODO: this should be fixed in ./configure.ac
-            cmd += ' --with-boost-lib-dir=/usr/local/lib'      # TODO: this should be fixed in ./configure.ac
+        if 'shell' in features:
+            cmd += ' --enable-shell'
 
         execute(cmd, cwd=src_path, env=env, check_times=check_times)
 
@@ -941,7 +954,7 @@ def ensure_hammer_deps():
 
 
 DEFAULT_FEATURES = ['install', 'unittest', 'docs']
-ALL_FEATURES = ['install', 'unittest', 'docs', 'mysql', 'pgsql', 'cql', 'native-pkg', 'radius']
+ALL_FEATURES = ['install', 'unittest', 'docs', 'mysql', 'pgsql', 'cql', 'native-pkg', 'radius', 'shell']
 
 def parse_args():
     parser = argparse.ArgumentParser(description='Kea develepment environment management tool.')