mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #7097 from heitbaum/mariadb
[le11] mariadb: update to 10.9.4 and addon (108)
This commit is contained in:
commit
00be2051b6
@ -1,3 +1,6 @@
|
|||||||
|
108
|
||||||
|
- update MariaDB to 10.9.4
|
||||||
|
|
||||||
107
|
107
|
||||||
- update MariaDB to 10.9.3
|
- update MariaDB to 10.9.3
|
||||||
- supports openssl
|
- supports openssl
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="mariadb"
|
PKG_NAME="mariadb"
|
||||||
PKG_VERSION="10.9.3"
|
PKG_VERSION="10.9.4"
|
||||||
PKG_REV="107"
|
PKG_REV="108"
|
||||||
PKG_SHA256="9a1e229972fcccc8270e633f68d3fb824da151dcf4f53da1df8d947aca876bee"
|
PKG_SHA256="1dff08a0f37ea5cf8f00cbd12d40e80759fae7d73184ccf56b5b51acfdcfc054"
|
||||||
PKG_LICENSE="GPL2"
|
PKG_LICENSE="GPL2"
|
||||||
PKG_SITE="https://mariadb.org"
|
PKG_SITE="https://mariadb.org"
|
||||||
PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
oe_setup_addon service.mariadb
|
oe_setup_addon service.mariadb
|
||||||
|
|
||||||
# create dir for socket and pid
|
# create dir for socket and pid
|
||||||
mkdir -p /var/run/mysqld
|
mkdir -p /run/mysqld
|
||||||
|
|
||||||
# exit if already running
|
# exit if already running
|
||||||
PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}')
|
PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}')
|
||||||
|
@ -3,4 +3,4 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
kill $(cat /var/run/mysqld/mysqld.pid)
|
kill $(cat /run/mysqld/mysqld.pid)
|
||||||
|
@ -17,14 +17,14 @@
|
|||||||
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
|
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
|
||||||
[client]
|
[client]
|
||||||
port = 3306
|
port = 3306
|
||||||
socket = /var/run/mysqld/mysqld.sock
|
socket = /run/mysqld/mysqld.sock
|
||||||
|
|
||||||
# Here is entries for some specific programs
|
# Here is entries for some specific programs
|
||||||
# The following values assume you have at least 32M ram
|
# The following values assume you have at least 32M ram
|
||||||
|
|
||||||
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
|
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
|
||||||
[mysqld_safe]
|
[mysqld_safe]
|
||||||
socket = /var/run/mysqld/mysqld.sock
|
socket = /run/mysqld/mysqld.sock
|
||||||
nice = 0
|
nice = 0
|
||||||
|
|
||||||
[mysqld]
|
[mysqld]
|
||||||
@ -32,8 +32,8 @@ nice = 0
|
|||||||
# * Basic Settings
|
# * Basic Settings
|
||||||
#
|
#
|
||||||
user = root
|
user = root
|
||||||
pid-file = /var/run/mysqld/mysqld.pid
|
pid-file = /run/mysqld/mysqld.pid
|
||||||
socket = /var/run/mysqld/mysqld.sock
|
socket = /run/mysqld/mysqld.sock
|
||||||
port = 3306
|
port = 3306
|
||||||
basedir = /storage/.kodi/addons/service.mariadb
|
basedir = /storage/.kodi/addons/service.mariadb
|
||||||
datadir = /storage/.kodi/userdata/addon_data/service.mariadb/data
|
datadir = /storage/.kodi/userdata/addon_data/service.mariadb/data
|
||||||
|
@ -5,7 +5,7 @@ Before=kodi.service
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
PIDFile=/var/run/mysqld/mysqld.pid
|
PIDFile=/run/mysqld/mysqld.pid
|
||||||
ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.start"
|
ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.start"
|
||||||
ExecStop=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.stop"
|
ExecStop=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.stop"
|
||||||
TimeoutStartSec=60
|
TimeoutStartSec=60
|
||||||
|
Loading…
x
Reference in New Issue
Block a user