[arch-commits] Commit in mariadb/trunk (PKGBUILD)
Christian Hesse
eworm at archlinux.org
Thu Jan 5 13:33:11 UTC 2017
Date: Thursday, January 5, 2017 @ 13:33:11
Author: eworm
Revision: 285296
upgpkg: mariadb 10.1.20-3
proper handling of sysconfdir
Modified:
mariadb/trunk/PKGBUILD
----------+
PKGBUILD | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-05 10:06:01 UTC (rev 285295)
+++ PKGBUILD 2017-01-05 13:33:11 UTC (rev 285296)
@@ -6,7 +6,7 @@
pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
pkgver=10.1.20
_pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url='http://mariadb.org/'
@@ -39,7 +39,6 @@
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
-DBUILD_CONFIG=mysql_release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
-DMYSQL_DATADIR=/var/lib/mysql \
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-DDEFAULT_CHARSET=utf8 \
@@ -50,6 +49,8 @@
-DINSTALL_MANDIR=share/man \
-DINSTALL_PLUGINDIR=lib/mysql/plugin \
-DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_SYSCONFDIR=/etc/mysql \
+ -DINSTALL_SYSCONF2DIR=/etc/mysql \
-DINSTALL_INCLUDEDIR=include/mysql \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DINSTALL_MYSQLSHAREDIR=share/mysql \
@@ -145,7 +146,12 @@
cd "$pkgdir"
+ # We specified INSTALL_SYSCONFDIR and INSTALL_SYSCONF2DIR to have proper paths
+ # in binaries and support file. But we want our own files...
+ # TOOD: Change to upstream file layout with version 10.2.x?
+ rm -r etc/
install -Dm0644 usr/share/mysql/my-medium.cnf etc/mysql/my.cnf
+
install -Dm0644 "${srcdir}"/mariadb-tmpfile.conf usr/lib/tmpfiles.d/mariadb.conf
install -Dm0644 "${srcdir}"/mariadb-sysusers.conf usr/lib/sysusers.d/mariadb.conf
ln -s mariadb.service usr/lib/systemd/system/mysqld.service
More information about the arch-commits
mailing list