aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Haazen <marcel@haazen.xyz>2019-04-17 15:45:00 +0200
committerJakub Jirutka <jakub@jirutka.cz>2019-05-09 21:38:38 +0200
commit7617760f90a118f7c7a0211d13390ac696a22522 (patch)
treee3a5416c4f0484765b164aba38dfe4f0ba343d6f
parent8dce0df69ba35924c14fe3115a1393f9f6968ffa (diff)
downloadaports-7617760f90a118f7c7a0211d13390ac696a22522.tar.bz2
aports-7617760f90a118f7c7a0211d13390ac696a22522.tar.xz
main/mariadb: replace rpm parameter with datadir parameter
So the database is created in correct directory and not in /data.
-rw-r--r--main/mariadb/APKBUILD5
-rw-r--r--main/mariadb/mariadb.initd2
2 files changed, 4 insertions, 3 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index caa6171ed1..9d99eda1d5 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -3,10 +3,11 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Contributor: TBK <alpine@jjtc.eu>
+# Contributor: Marcel Haazen <marcel@haazen.xyz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
pkgver=10.3.13
-pkgrel=0
+pkgrel=1
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org"
pkgusers="mysql"
@@ -421,7 +422,7 @@ _plugin_rocksdb() {
}
sha512sums="3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd mariadb-10.3.13.tar.gz
-06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd
+b142b965ee2e02242f013f6b36444729b55f646ced4590989221788fe7adafc0d87b8856e4df94fba972de57aa47d4592958b302b99681b771818c6e398d1332 mariadb.initd
b4469f2f0299e71c09b65c91373f2d72b7fe9a9cd58ad24737a78a8097473b29c32b7267e173a2dfe1158f2f7d40a7fb02fb1b35caeda44d16ae3b9e2602a75f fix-c11-atomics-check.patch
e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch
70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch"
diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd
index 143ca8ff54..35906a3a8c 100644
--- a/main/mariadb/mariadb.initd
+++ b/main/mariadb/mariadb.initd
@@ -16,7 +16,7 @@ depend() {
setup() {
ebegin "Creating a new MySQL database"
- mysql_install_db --user=mysql --rpm
+ mysql_install_db --user=mysql --datadir=/var/lib/mysql
eend $?
}