summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc6
1 files 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() {
186 # mini-benchmark used for Gitlab-CI to run on every commit to catch 186 # mini-benchmark used for Gitlab-CI to run on every commit to catch
187 # if there are severe performance regressions. 187 # if there are severe performance regressions.
188 # remove it to avoid introducing bash dependency 188 # remove it to avoid introducing bash dependency
189 if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then 189 if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then
190 rm -rf ${D}${datadir}/mysql/mini-benchmark 190 rm -rf ${D}${datadir}/mariadb/mini-benchmark
191 fi 191 fi
192 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then 192 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
193 pam_so=$(find ${D} -name pam_user_map.so) 193 pam_so=$(find ${D} -name pam_user_map.so)
@@ -349,7 +349,7 @@ FILES:${PN}-server = "\
349 ${libdir}/plugin/*.so \ 349 ${libdir}/plugin/*.so \
350 ${base_libdir}/security/*.so \ 350 ${base_libdir}/security/*.so \
351 ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ 351 ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \
352 ${datadir}/mysql/ \ 352 ${datadir}/mariadb/ \
353 ${localstatedir}/mysql/ \ 353 ${localstatedir}/mysql/ \
354 ${sysconfdir}/init.d/mysqld \ 354 ${sysconfdir}/init.d/mysqld \
355 ${sysconfdir}/my.cnf \ 355 ${sysconfdir}/my.cnf \