mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MARIADB_VERSION = 10.3.16
|
||||
MARIADB_VERSION = 10.3.23
|
||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
|
||||
# Tarball no longer contains LGPL license text
|
||||
@@ -19,8 +19,10 @@ MARIADB_DEPENDENCIES = \
|
||||
openssl \
|
||||
zlib \
|
||||
libaio \
|
||||
libxml2 \
|
||||
readline
|
||||
libxml2
|
||||
|
||||
# use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+
|
||||
MARIADB_CONF_OPTS += -DWITH_READLINE=ON
|
||||
|
||||
# We won't need unit tests
|
||||
MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0
|
||||
@@ -86,7 +88,8 @@ MARIADB_CONF_OPTS += \
|
||||
-DMYSQL_DATADIR=/var/lib/mysql \
|
||||
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
|
||||
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF
|
||||
HOST_MARIADB_DEPENDENCIES = host-openssl
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system
|
||||
|
||||
# Some helpers must be compiled for host in order to crosscompile mariadb for
|
||||
# the target. They are then included by import_executables.cmake which is
|
||||
@@ -117,17 +120,15 @@ endef
|
||||
define MARIADB_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 644 package/mariadb/mysqld.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/mysqld.service
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/mysqld.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service
|
||||
endef
|
||||
endif
|
||||
|
||||
# We don't need mysql_config on the target as it's only useful in staging
|
||||
# We also don't need the test suite on the target
|
||||
# We don't need mysql_config or mariadb_config on the target as it's
|
||||
# only useful in staging. We also don't need the test suite on the target.
|
||||
define MARIADB_POST_INSTALL
|
||||
mkdir -p $(TARGET_DIR)/var/lib/mysql
|
||||
$(RM) $(TARGET_DIR)/usr/bin/mysql_config
|
||||
$(RM) $(TARGET_DIR)/usr/bin/mariadb_config
|
||||
$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user