helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 22:23:14 +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>

(master rev: ddd322323eba44542b6b631d455e3298c50c4535)
Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Guocai He 2025-07-23 09:51:58 +08:00 committed by Gyorgy Sarvari
parent 78afe9d40c
commit 23a3451a6d
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

@ -44,10 +44,12 @@ S = "${WORKDIR}/mariadb-${PV}"
BINCONFIG_GLOB = "mysql_config" BINCONFIG_GLOB = "mysql_config"
inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script multilib_header
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"
@ -167,6 +169,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 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/