From: Marcin Godzina Date: Tue, 14 May 2024 08:28:58 +0000 (+0000) Subject: [#3382] change to mariadb in ubuntu 24 X-Git-Tag: Kea-2.6.0~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7db23b61aaeb2d62feec00e52dffd42b1afbbb;p=thirdparty%2Fkea.git [#3382] change to mariadb in ubuntu 24 --- diff --git a/hammer.py b/hammer.py index 7f47e54b56..e3ff456ec2 100755 --- a/hammer.py +++ b/hammer.py @@ -1866,10 +1866,14 @@ def install_packages_local(system, revision, features, check_times, ignore_error packages.extend(['dh-python']) if 'mysql' in features: - if revision == '16.04': - packages.extend(['mysql-client', 'libmysqlclient-dev', 'mysql-server']) + if int(revision.split(".")[0]) < 24: + if revision == '16.04': + packages.extend(['mysql-client', 'libmysqlclient-dev', 'mysql-server']) + else: + packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev', 'mysql-server']) else: - packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev', 'mysql-server']) + packages.extend(['mariadb-client', 'mariadb-server', 'libmariadb-dev-compat']) + if 'pgsql' in features: if revision == '16.04':