helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 18:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: File conflicts for multilib

Browse Source 
File conflicts between attempted installs of mariadb and lib32-mariadb

Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Guocai He 2024-08-22 09:52:00 +08:00 committed by Khem Raj
parent a29c6386d5
commit ddd322323e
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-oe/recipes-dbs/mysql/mariadb.inc
View File

@ -33,10 +33,12 @@ UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
BINCONFIG_GLOB = "mysql_config" BINCONFIG_GLOB = "mysql_config"
inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig
MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \
${PN}-setupdb:${bindir}/mariadb-install-db" ${PN}-setupdb:${bindir}/mariadb-install-db \
libmysqlclient-dev:${bindir}/mysql_config \
"
INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
INITSCRIPT_NAME:${PN}-server = "mysqld" INITSCRIPT_NAME:${PN}-server = "mysqld"
@ -160,6 +162,7 @@ mariadb_sysroot_preprocess () {
do_install() { do_install() {
oe_runmake 'DESTDIR=${D}' install oe_runmake 'DESTDIR=${D}' install
oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h
install -d ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/init.d
install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/