mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues 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>

(master rev: ddd322323e)
Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Guocai He
2025-07-23 10:18:37 +08:00
committed by Armin Kuster
parent 958ef90ab0
commit c781171d34
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/mysql/mariadb.inc
+5 -2
View File
@@ -31,10 +31,12 @@ S = "${WORKDIR}/mariadb-${PV}"
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 \
${PN}-setupdb:${bindir}/mariadb-install-db"
${PN}-setupdb:${bindir}/mariadb-install-db \
libmysqlclient-dev:${bindir}/mysql_config \
"
INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
INITSCRIPT_NAME:${PN}-server = "mysqld"
@@ -157,6 +159,7 @@ mariadb_sysroot_preprocess () {
do_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 -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/