From 6c6ee67566bbb5929a4e0e1e4aaf53e36df6d94c Mon Sep 17 00:00:00 2001
From: beefcurtains <beefcurtains@users.noreply.github.com>
Date: Wed, 1 Jul 2015 08:24:28 +0000
Subject: [PATCH] mariadb: remove systemd build option (#1736)

---
 srcpkgs/mariadb/files/mysqld-post     |  8 --------
 srcpkgs/mariadb/files/mysqld.service  | 16 ----------------
 srcpkgs/mariadb/files/mysqld.tmpfiles |  1 -
 srcpkgs/mariadb/template              | 10 +---------
 4 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 srcpkgs/mariadb/files/mysqld-post
 delete mode 100644 srcpkgs/mariadb/files/mysqld.service
 delete mode 100644 srcpkgs/mariadb/files/mysqld.tmpfiles

diff --git a/srcpkgs/mariadb/files/mysqld-post b/srcpkgs/mariadb/files/mysqld-post
deleted file mode 100644
index 240d5ff21de..00000000000
--- a/srcpkgs/mariadb/files/mysqld-post
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    echo "$response" | grep -q "Access denied for user" && break
-    sleep 1
-done
diff --git a/srcpkgs/mariadb/files/mysqld.service b/srcpkgs/mariadb/files/mysqld.service
deleted file mode 100644
index dd65511d7b7..00000000000
--- a/srcpkgs/mariadb/files/mysqld.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/mariadb/files/mysqld.tmpfiles b/srcpkgs/mariadb/files/mysqld.tmpfiles
deleted file mode 100644
index 6883dc79888..00000000000
--- a/srcpkgs/mariadb/files/mysqld.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8820afe2d5f..4f50807c697 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.0.20
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -25,7 +25,6 @@ depends="mariadb-client"
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 conf_files="/etc/mysql/my.cnf"
-build_options="systemd"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
@@ -68,13 +67,6 @@ post_install() {
 	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
 
 	vsv mysqld
-
-	# systemd service.
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/mysqld-post 755 usr/bin
-		vinstall ${FILESDIR}/mysqld.tmpfiles 644 usr/lib/tmpfiles.d mysqld.conf
-	fi
 }
 
 libmariadbclient_package() {