[oe] [meta-oe][Patch 1/2] mariadb: fix file conflictions when multilib enabled

[kai.kang at windriver.com]

From: Kai Kang <kai.kang at windriver.com>

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 <kai.kang at windriver.com>
---
 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 9a398b308..9ddf2bee5 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"
-- 
2.20.0