CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages 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] 320a4b52c9

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
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-oe/recipes-dbs/mysql/mariadb.inc
View File

@ -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 \