From 23a3451a6da7e63d5122318ea9a5d0e1f8cf1e83 Mon Sep 17 00:00:00 2001 From: Guocai He Date: Wed, 23 Jul 2025 09:51:58 +0800 Subject: [PATCH] mariadb: File conflicts for multilib File conflicts between attempted installs of mariadb and lib32-mariadb Signed-off-by: Guocai He Signed-off-by: Khem Raj (master rev: ddd322323eba44542b6b631d455e3298c50c4535) Signed-off-by: Guocai He Signed-off-by: Gyorgy Sarvari --- meta-oe/recipes-dbs/mysql/mariadb.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 3980948859..fde5fefd6a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -44,10 +44,12 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script +inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ - ${PN}-setupdb:${bindir}/mariadb-install-db" + ${PN}-setupdb:${bindir}/mariadb-install-db \ + libmysqlclient-dev:${bindir}/mysql_config \ + " INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME:${PN}-server = "mysqld" @@ -167,6 +169,7 @@ mariadb_sysroot_preprocess () { do_install() { oe_runmake 'DESTDIR=${D}' install + oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h install -d ${D}/${sysconfdir}/init.d install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/