From f06a439827fb3ec6839f447c5fde2b777c48c982 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 13 Feb 2025 17:23:05 +0800 Subject: mariadb: move /usr/share/mysql to /usr/share/mariadb 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 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index dae41d89aa..c90e17e129 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -186,8 +186,8 @@ do_install() { # mini-benchmark used for Gitlab-CI to run on every commit to catch # if there are severe performance regressions. # remove it to avoid introducing bash dependency - if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then - rm -rf ${D}${datadir}/mysql/mini-benchmark + if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then + rm -rf ${D}${datadir}/mariadb/mini-benchmark fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then pam_so=$(find ${D} -name pam_user_map.so) @@ -349,7 +349,7 @@ FILES:${PN}-server = "\ ${libdir}/plugin/*.so \ ${base_libdir}/security/*.so \ ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ - ${datadir}/mysql/ \ + ${datadir}/mariadb/ \ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d/mysqld \ ${sysconfdir}/my.cnf \ -- cgit v1.2.3-54-g00ecf