From 24a645d1d72c619d4b23bad49acc2cf4c9157f89 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Mon, 21 Aug 2023 13:51:14 +0000 Subject: [PATCH] Fix bindep for Debian bookworm Debian prefers Mariadb instead of mysql, the libmysqlclient-dev pkg is not available there, replace it with libmariadb-dev-compat. Replace mysql-server with mariadb-server. This patch is similar to [1]. [1]https://review.opendev.org/c/openstack/nova/+/891256 Closes-Bug: #2032183 Change-Id: Ica5b2b4312337fea1f47e4c569398044bd47ecf2 --- bindep.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bindep.txt b/bindep.txt index 7f2f0be4197..d55b5cc337b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -13,12 +13,13 @@ libffi-devel [platform:rpm] # MySQL and PostgreSQL databases since some jobs are set up in # OpenStack infra that need these like # periodic-neutron-py35-with-neutron-lib-master. -libmysqlclient-dev [platform:dpkg test] +libmariadb-dev-compat [platform:debian] +libmysqlclient-dev [platform:ubuntu] mariadb [platform:rpm test] mariadb-devel [platform:rpm test] -mariadb-server [platform:rpm test] -mysql-client [platform:dpkg test] -mysql-server [platform:dpkg test] +mariadb-server [platform:rpm platform:redhat platform:debian test] +mysql-client [platform:dpkg !platform:debian test] +mysql-server [platform:dpkg !platform:debian test] postgresql [test] postgresql-client [platform:dpkg test] postgresql-devel [platform:rpm test]