mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

mariadb: move /usr/share/mysql to /usr/share/mariadb

Browse Source 
Fix error:
$mariadb-install-db --basedir=/usr
FATAL ERROR: Could not find /usr/share/mariadb/fill_help_tables.sql

Upstream commit [1] move /usr/share/mysql to /usr/share/mariadb, this
make related files split into wrong package, and not installed by
default, so cause above error

[1] https://github.com/MariaDB/server/commit/320a4b52c9c73a37b3553cec6a9d170924957c36

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2025-02-13 17:23:05 +08:00
committed by Khem Raj
parent 423d560def
commit f06a439827
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/mysql/mariadb.inc
+3 -3
View File
@@ -186,8 +186,8 @@ do_install() {
# mini-benchmark used for Gitlab-CI to run on every commit to catch # mini-benchmark used for Gitlab-CI to run on every commit to catch
# if there are severe performance regressions. # if there are severe performance regressions.
# remove it to avoid introducing bash dependency # remove it to avoid introducing bash dependency
if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then
rm -rf ${D}${datadir}/mysql/mini-benchmark rm -rf ${D}${datadir}/mariadb/mini-benchmark
fi fi
if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
pam_so=$(find ${D} -name pam_user_map.so) pam_so=$(find ${D} -name pam_user_map.so)
@@ -349,7 +349,7 @@ FILES:${PN}-server = "\
${libdir}/plugin/*.so \ ${libdir}/plugin/*.so \
${base_libdir}/security/*.so \ ${base_libdir}/security/*.so \
${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \
${datadir}/mysql/ \ ${datadir}/mariadb/ \
${localstatedir}/mysql/ \ ${localstatedir}/mysql/ \
${sysconfdir}/init.d/mysqld \ ${sysconfdir}/init.d/mysqld \
${sysconfdir}/my.cnf \ ${sysconfdir}/my.cnf \