mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
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>
This commit is contained in:
@@ -28,7 +28,9 @@ S = "${WORKDIR}/mariadb-${PV}"
|
|||||||
|
|
||||||
BINCONFIG_GLOB = "mysql_config"
|
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_PACKAGES = "${PN}-server ${PN}-setupdb"
|
||||||
INITSCRIPT_NAME_${PN}-server = "mysqld"
|
INITSCRIPT_NAME_${PN}-server = "mysqld"
|
||||||
|
|||||||
Reference in New Issue
Block a user