aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/mysql
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-09-04 04:42:28 -0400
committerKhem Raj <raj.khem@gmail.com>2019-09-04 08:56:30 -0700
commit22486241fd62dcb1670ada88c57d52e15b854d14 (patch)
tree522d586be3a9dfdb1d61c35c5a4f91de752e6506 /meta-oe/recipes-dbs/mysql
parent1706197678cdb7de787e0dbd4b6c0f3ece15ffaa (diff)
downloadmeta-openembedded-22486241fd62dcb1670ada88c57d52e15b854d14.tar.gz
meta-openembedded-22486241fd62dcb1670ada88c57d52e15b854d14.tar.bz2
meta-openembedded-22486241fd62dcb1670ada88c57d52e15b854d14.zip
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@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc4
1 files changed, 3 insertions, 1 deletions
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"