summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc5
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/my.cnf2
2 files changed, 1 insertions, 6 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 5787ae4bd7..7cf08f4719 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -168,11 +168,6 @@ do_install() {
168 sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ 168 sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \
169 ${D}${systemd_unitdir}/system/install_db.service 169 ${D}${systemd_unitdir}/system/install_db.service
170 170
171 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
172 install -d ${D}${sysconfdir}/tmpfiles.d
173 echo "f /var/log/mysqld.err 0640 mysql mysql -" \
174 > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf
175 fi
176 install -d ${D}${bindir} 171 install -d ${D}${bindir}
177 install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} 172 install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir}
178 install -d ${D}${datadir}/doc/${PN} 173 install -d ${D}${datadir}/doc/${PN}
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/my.cnf b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
index dc4c172e54..75db46a559 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
+++ b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
@@ -10,7 +10,7 @@ user = mysql
10port = 3306 10port = 3306
11socket = /var/lib/mysql/mysql.sock 11socket = /var/lib/mysql/mysql.sock
12pid-file = /var/lib/mysql/mysqld.pid 12pid-file = /var/lib/mysql/mysqld.pid
13log-error = /var/log/mysqld.err 13log-error = /var/log/mysqld.log
14basedir = /usr 14basedir = /usr
15datadir = /var/lib/mysql 15datadir = /var/lib/mysql
16skip-external-locking 16skip-external-locking