Merge pull request #7097 from heitbaum/mariadb

[le11] mariadb: update to 10.9.4 and addon (108)
This commit is contained in:
CvH 2022-11-10 09:32:59 +01:00 committed by GitHub
commit 00be2051b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 10 deletions

View File

@ -1,3 +1,6 @@
108
- update MariaDB to 10.9.4
107
- update MariaDB to 10.9.3
- supports openssl

View File

@ -2,9 +2,9 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mariadb"
PKG_VERSION="10.9.3"
PKG_REV="107"
PKG_SHA256="9a1e229972fcccc8270e633f68d3fb824da151dcf4f53da1df8d947aca876bee"
PKG_VERSION="10.9.4"
PKG_REV="108"
PKG_SHA256="1dff08a0f37ea5cf8f00cbd12d40e80759fae7d73184ccf56b5b51acfdcfc054"
PKG_LICENSE="GPL2"
PKG_SITE="https://mariadb.org"
PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"

View File

@ -7,7 +7,7 @@
oe_setup_addon service.mariadb
# create dir for socket and pid
mkdir -p /var/run/mysqld
mkdir -p /run/mysqld
# exit if already running
PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}')

View File

@ -3,4 +3,4 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
kill $(cat /var/run/mysqld/mysqld.pid)
kill $(cat /run/mysqld/mysqld.pid)

View File

@ -17,14 +17,14 @@
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
[client]
port = 3306
socket = /var/run/mysqld/mysqld.sock
socket = /run/mysqld/mysqld.sock
# Here is entries for some specific programs
# The following values assume you have at least 32M ram
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
[mysqld_safe]
socket = /var/run/mysqld/mysqld.sock
socket = /run/mysqld/mysqld.sock
nice = 0
[mysqld]
@ -32,8 +32,8 @@ nice = 0
# * Basic Settings
#
user = root
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
pid-file = /run/mysqld/mysqld.pid
socket = /run/mysqld/mysqld.sock
port = 3306
basedir = /storage/.kodi/addons/service.mariadb
datadir = /storage/.kodi/userdata/addon_data/service.mariadb/data

View File

@ -5,7 +5,7 @@ Before=kodi.service
[Service]
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"
ExecStop=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.stop"
TimeoutStartSec=60