mariadb: remove systemd build option (#1736)
This commit is contained in:
parent
a639d9f5a9
commit
6c6ee67566
4 changed files with 1 additions and 34 deletions
|
@ -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
|
|
@ -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
|
|
@ -1 +0,0 @@
|
|||
d /run/mysqld 0755 mysql mysql -
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in a new issue