From 22486241fd62dcb1670ada88c57d52e15b854d14 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 4 Sep 2019 04:42:28 -0400 Subject: mariadb: fix file conflictions when multilib enabled When multilib is enabled, it complains file conflictions of /usr/bin/mysql_install_db and /usr/bin/mysqld_safe. Inherit multilib_script to solve the issues. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 9a398b3088..9ddf2bee5c 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -28,7 +28,9 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd +inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script + +MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mysql_install_db ${PN}-server:${bindir}/mysqld_safe" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld" -- cgit v1.2.3-54-g00ecf