[oe-commits] [meta-openembedded] 02/02: mariadb: fix file conflictions when multilib enabled

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 22486241fd62dcb1670ada88c57d52e15b854d14
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Sep 4 04:42:28 2019 -0400

    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 <kai.kang at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.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 9a398b3..9ddf2be 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.