diff options
author | Guocai He <guocai.he.cn@windriver.com> | 2025-07-23 10:18:37 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2025-08-02 13:37:04 -0400 |
commit | c781171d34dc4e1b4074c48b5e392198c0458498 (patch) | |
tree | a510337191b201db7eb0cd24536612d14654bbf2 | |
parent | 958ef90ab0e83ba7cdc8b1a4abcc34fb2b1d5c0e (diff) | |
download | meta-openembedded-c781171d34dc4e1b4074c48b5e392198c0458498.tar.gz |
mariadb: File conflicts for multilib
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: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 83a3a1cafd..6e7c01a775 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -31,10 +31,12 @@ S = "${WORKDIR}/mariadb-${PV}" | |||
31 | 31 | ||
32 | BINCONFIG_GLOB = "mysql_config" | 32 | BINCONFIG_GLOB = "mysql_config" |
33 | 33 | ||
34 | inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig | 34 | inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig |
35 | 35 | ||
36 | MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ | 36 | MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ |
37 | ${PN}-setupdb:${bindir}/mariadb-install-db" | 37 | ${PN}-setupdb:${bindir}/mariadb-install-db \ |
38 | libmysqlclient-dev:${bindir}/mysql_config \ | ||
39 | " | ||
38 | 40 | ||
39 | INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" | 41 | INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" |
40 | INITSCRIPT_NAME:${PN}-server = "mysqld" | 42 | INITSCRIPT_NAME:${PN}-server = "mysqld" |
@@ -157,6 +159,7 @@ mariadb_sysroot_preprocess () { | |||
157 | 159 | ||
158 | do_install() { | 160 | do_install() { |
159 | oe_runmake 'DESTDIR=${D}' install | 161 | oe_runmake 'DESTDIR=${D}' install |
162 | oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h | ||
160 | 163 | ||
161 | install -d ${D}/${sysconfdir}/init.d | 164 | install -d ${D}/${sysconfdir}/init.d |
162 | install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ | 165 | install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ |