replace mysql with mariadb 10.0

Replaces the old mysql 5.1 with mariadb 10.0. The package was not renamed as mariadb is a drop-in replacement for mysql.

package/Config.in +0 -0

index 332f05d..9fca1f6 100644

Hi,

Quoted 3 lines · Ryan Coe

Replaces the old mysql 5.1 with mariadb 10.0. The package was not renamed
as mariadb is a drop-in replacement for mysql.

Give your patch a try

- openssl is mentioned in the dependencies but not selected in Config.in

- fails to compile for me when using uclibc as C library:

==
[ 82%] Building CXX object sql/CMakeFiles/sql.dir/signal_handler.cc.o /mnt/nfs/mdbtest/buildroot/output/build/mysql-10.0.27/sql/signal_handler.cc:
In function ?void handle_fatal_signal(int)?:
/mnt/nfs/mdbtest/buildroot/output/build/mysql-10.0.27/sql/signal_handler.cc:274:21:
error: ?thd? was not declared in this scope

      my_write_stderr(thd->query(), MY_MIN(65536U, thd->query_length()));
                      ^

/mnt/nfs/mdbtest/buildroot/output/build/mysql-10.0.27/sql/signal_handler.cc:
In function ?void handle_fatal_signal(int)?:
/mnt/nfs/mdbtest/buildroot/output/build/mysql-10.0.27/sql/signal_handler.cc:274:21:
error: ?thd? was not declared in this scope

      my_write_stderr(thd->query(), MY_MIN(65536U, thd->query_length()));
                      ^

libmysqld/CMakeFiles/sql_embedded.dir/build.make:590: recipe for target 'libmysqld/CMakeFiles/sql_embedded.dir/__/sql/signal_handler.cc.o' failed make[4]: *** [libmysqld/CMakeFiles/sql_embedded.dir/__/sql/signal_handler.cc.o] Error 1
make[4]: *** Waiting for unfinished jobs....
==

- is the custom my.cnf necessary?

- any specific reason to choose the older MariaDB 10.0.x branch over the current stable 10.1.x?
(believe the newer version also comes with systemd support, which may save you from having to create your own unit files)

Quoted 6 lines

package/Config.in +0 -0

index 332f05d..9fca1f6 100644

package/Config.in menu "Database" · line 909

Quoted 9 lines

package/Config.in +1 -1

@@ -902,8 +902,8 @@ menu "Database"
      source "package/kompexsqlite/Config.in"
      source "package/leveldb/Config.in"
      source "package/libpqxx/Config.in"
-    source "package/mongodb/Config.in"
      source "package/mysql/Config.in"
+    source "package/mongodb/Config.in"
      source "package/postgresql/Config.in"
      source "package/redis/Config.in"
      source "package/sqlcipher/Config.in"

Why move it?

Yours sincerely,

Floris Bos
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Replaces the old mysql 5.1 with mariadb 10.1. The package was not renamed as mariadb is a drop-in replacement for mysql.

Based on the work by:
Sylvain Raybaud <[email protected]>
https://patchwork.ozlabs.org/patch/538045/

Signed-off-by Ryan Coe <[email protected]>

package/mysql/0001-add-extra-check-for-librt.patch new file +11 -0

new file mode 100644
index 0000000..aea7064
@@ -0,0 +1,26 @@
+From 31094bd1fcccba2fb8b234735bb9bf60ba4afa28 Mon Sep 17 00:00:00 2001
+From: Ryan Coe <[email protected]>
+Date: Sun, 18 Sep 2016 16:35:59 -0700
+Subject: [PATCH 1/1] add extra check for librt
+
+Signed-off-by: Ryan Coe <[email protected]>
+---
+ configure.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.cmake b/configure.cmake

package/mysql/Config.in +8 -0

 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
+MYSQL_LIB="/var/lib/mysql"
+MYSQL_RUN="/run/mysqld"
+MYSQL_PID="$MYSQL_RUN/mysqld.pid"
+
+wait_for_pid() {
+	WAIT_DELAY=10
+	if [ ! -e $MYSQL_PID ]; then
+		while [ $WAIT_DELAY -gt 0 ]; do

package/mysql/mysql.mk +1 -2

index 7af4711..0c05162 100644
@@ -1,110 +1,98 @@
 ################################################################################
 #
-# mysql
+# mariadb
 #
 ################################################################################
 
-MYSQL_VERSION_MAJOR = 5.1

Hello,

Quoted 7 lines · Ryan Coe

Replaces the old mysql 5.1 with mariadb 10.1. The package was not renamed as mariadb is a drop-in replacement for mysql.

Based on the work by:
Sylvain Raybaud <[email protected]>
https://patchwork.ozlabs.org/patch/538045/

Quoted 1 line

Signed-off-by Ryan Coe <[email protected]>

I don't know if I like the fact that we're hi-jacking the mysql package here. Maybe this should be added as a separate package/mariadb/ package, and then the mysql package changed to a virtual package afterwards, in a second patch?

This would also have the benefit of making this patch easier to review.

Quoted 12 lines

package/mysql/S97mysqld +12 -0

+MYSQL_LIB="/var/lib/mysql"
+MYSQL_RUN="/run/mysqld"
+MYSQL_PID="$MYSQL_RUN/mysqld.pid"
+
+wait_for_pid() {
+	WAIT_DELAY=10
+	if [ ! -e $MYSQL_PID ]; then
+		while [ $WAIT_DELAY -gt 0 ]; do
+			if [ -e $MYSQL_PID ]; then
+				return 0
+			fi
+			sleep 1

package/mysql/S97mysqld line 23

Quoted 6 lines

package/mysql/S97mysqld +6 -0

+			: $((WAIT_DELAY -= 1))
+		done
+		return 1
+	fi
+	return 0
+}

Do we really need something like this?

package/mysql/mysql.mk line 3

Quoted 10 lines

package/mysql/mysql.mk +1 -1

index 7af4711..0c05162 100644
@@ -1,110 +1,98 @@
 ################################################################################
 #
-# mysql
+# mariadb

Quoted 4 lines

package/mysql/mysql.mk +0 -1

 #
 ################################################################################
 
-MYSQL_VERSION_MAJOR = 5.1

package/mysql/mysql.mk line 10

Quoted 10 lines

package/mysql/mysql.mk +3 -6

-MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).73
-MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz
-MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_VERSION_MAJOR)
-MYSQL_INSTALL_STAGING = YES
-MYSQL_DEPENDENCIES = readline ncurses
-MYSQL_AUTORECONF = YES
+MYSQL_VERSION = 10.1.17
+MYSQL_SOURCE = mariadb-$(MYSQL_VERSION).tar.gz
+MYSQL_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MYSQL_VERSION)/source
 MYSQL_LICENSE = GPLv2

Are you sure this license is correct? I believe mariadb is partly under LGPLv2, no?

package/mysql/mysql.mk line 32

Quoted 5 lines

package/mysql/mysql.mk +4 -0

+# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken
+# when it comes to cross-compilation we shall disable it and also disable TokuDB.
+MYSQL_OPTS += -DWITH_JEMALLOC=no
+MYSQL_OPTS += -DWITHOUT_TOKUDB=1

One line is probably enough for both.

package/mysql/mysql.mk line 46

Quoted 2 lines

package/mysql/mysql.mk +1 -0

+MYSQL_OPTS += -DCMAKE_BUILD_TYPE=Release

Not needed, already passed by Buildroot in pkg-cmake.mk.

package/mysql/mysql.mk line 47

Quoted 1 line

package/mysql/mysql.mk +1 -0

+MYSQL_OPTS += -DCMAKE_INSTALL_PREFIX=/usr

Not needed, already passed by Builroot in pkg-cmake.mk.

package/mysql/mysql.mk line 57

Quoted 10 lines

package/mysql/mysql.mk +10 -0

+MYSQL_OPTS += -DINSTALL_DOCDIR=share/doc/mariadb-$(MYSQL_VERSION)
+MYSQL_OPTS += -DINSTALL_DOCREADMEDIR=share/doc/mariadb-$(MYSQL_VERSION)
+MYSQL_OPTS += -DINSTALL_MANDIR=share/man
+MYSQL_OPTS += -DINSTALL_MYSQLSHAREDIR=share/mysql
+MYSQL_OPTS += -DINSTALL_MYSQLTESTDIR=share/mysql/test
+MYSQL_OPTS += -DINSTALL_PLUGINDIR=lib/mysql/plugin
+MYSQL_OPTS += -DINSTALL_SBINDIR=sbin
+MYSQL_OPTS += -DINSTALL_SCRIPTDIR=bin
+MYSQL_OPTS += -DINSTALL_SQLBENCHDIR=share/mysql/bench
+MYSQL_OPTS += -DINSTALL_SUPPORTFILESDIR=share/mysql

Are these all needed?

Also, we prefer:

MYSQL_OPTS += \
	-DFOO=baz \
	-DBAR=foo \
	-Dthis=that

when there are multiple options to assign.

Quoted 6 lines

package/mysql/mysql.mk +6 -0

+# 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
+# generated during the build of the host helpers. It is not necessary to build
+# the whole host package, only the "import_executables" target.
+# -DIMPORT_EXECUTABLES=$(BUILD_DIR)/host-mariadb-galera/import_executables.cmake
+# must then be passed to cmake during target build.

package/mysql/mysql.mk line 80

Quoted 2 lines

package/mysql/mysql.mk +2 -0

+HOST_MYSQL_MAKE_OPTS = import_executables
+MYSQL_IMPORT_EXECUTABLES += -DIMPORT_EXECUTABLES=$(HOST_MYSQL_BUILDDIR)/import_executables.cmake

I'm not sure why this import_executables.cmake file contains, but we generally don't like accessing stuff from a build directory during the build of another package. The host-mysql package is supposed to install things in $(HOST_DIR), and the target mysql package to use them from $(HOST_DIR).

package/mysql/mysql.mk line 36

Quoted 3 lines

package/mysql/mysql.mk +2 -0

+
+HOST_MYSQL_CONF_OPTS = $(MYSQL_OPTS)

This seems very wrong, a MYSQL_OPTS is for the target. As an example, the host should be configured with CMAKE_INSTALL_PREFIX=$(HOST_DIR)/usr. Please use an explicit value for HOST_MYSQL_CONF_OPTS, with only the necessary options.

package/mysql/mysql.mk line 83

Quoted 2 lines

package/mysql/mysql.mk +1 -0

+HOST_MYSQL_CONF_OPTS += $(MYSQL_HOST_OPTS)

Why do we have an intermediate MYSQL_HOST_OPTS variable then, rather than using HOST_MYSQL_CONF_OPTS directly?

package/mysql/mysql.mk line 39

Quoted 2 lines

package/mysql/mysql.mk +2 -0

+
+MYSQL_CONF_OPTS = $(MYSQL_OPTS)

Why do we have an intermediate MYSQL_OPTS variable? Just use MYSQL_CONF_OPTS directly.

package/mysql/mysql.mk line 86

Quoted 1 line

package/mysql/mysql.mk +1 -0

+MYSQL_CONF_OPTS += $(MYSQL_IMPORT_EXECUTABLES)

Intermediate variable not needed.

package/mysql/mysql.mk line 90

Quoted 4 lines

package/mysql/mysql.mk +4 -0

+
+# Don't install host-mysql. We just need to build import_executable
+# Therefore only run 'true' and do nothing, not even the default action.
+HOST_MYSQL_INSTALL_CMDS = true

This would be the place where you could install the host-mysql stuff in $(HOST_DIR).

package/mysql/mysql.mk line 46

Quoted 3 lines

package/mysql/mysql.mk +1 -1

 [Service]
-ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql'
+ExecStartPre=/bin/sh -c '[ "`ls -1 /var/lib/mysql | wc -l`" = "0" ] && mysql_install_db --basedir=/usr --datadir=/var/lib/mysql'

Why is the test on /var/mysql/mysql existence no longer good enough? It was much nicer than the test of the number of files in this directory.

Thanks for this effort, it is much appreciated that someone takes care of updating this complicated package.

Thanks!

Thomas

Quoted 4 lines

I don't know if I like the fact that we're hi-jacking the mysql package here. Maybe this should be added as a separate package/mariadb/ package, and then the mysql package changed to a virtual package afterwards, in a second patch?

*Someone* wrote in
http://lists.buildroot.org/pipermail/buildroot/2016-September/172401.html :

TP> As Floris said, our mysql package is deprecated, so I'm all for TP> replacing it with an up-to-date mariadb package. If later on, someone TP> else really needs MySQL, we can re-add it, and add the necessary TP> virtual package to allow selecting between mysql and mariadb. But until TP> there's a decent mysql package available, I believe replacing it TP> completely with an up-to-date mariadb package is better.

Quoted 8 lines

Quoted 8 lines

package/mysql/S97mysqld +8 -0

+wait_for_pid() {
+	WAIT_DELAY=10
+	if [ ! -e $MYSQL_PID ]; then
+		while [ $WAIT_DELAY -gt 0 ]; do
+			if [ -e $MYSQL_PID ]; then
+				return 0
+			fi
+			sleep 1

Quoted 8 lines

package/mysql/S97mysqld line 23

Quoted 6 lines

package/mysql/S97mysqld +6 -0

+			: $((WAIT_DELAY -= 1))
+		done
+		return 1
+	fi
+	return 0
+}  

Do we really need something like this?

Well, we need to wait until mysqld really has started before continuing,
because later init scripts may depend on it. However, I think it's better to use --no-auto-restart to mysqld_safe, which kind of implies the wait. AFAIK there are no other daemons that autorestart.

Quoted 4 lines

package/mysql/mysql.mk line 3

Quoted 4 lines

################################################################################
#

package/mysql/mysql.mk +1 -1

-# mysql
+# mariadb  

This should remain mysql, because the package is still called mysql. Oh well,
this entire header is silly, but it is what it is :-)

Quoted 6 lines

package/mysql/mysql.mk line 10

Quoted 3 lines

package/mysql/mysql.mk +2 -0

+MYSQL_SOURCE = mariadb-$(MYSQL_VERSION).tar.gz
+MYSQL_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MYSQL_VERSION)/source
 MYSQL_LICENSE = GPLv2  

Are you sure this license is correct? I believe mariadb is partly under LGPLv2, no?

It's a bit complicated because there is the old mysql client library that is
GPLv2 with FLOSS exception, and the new mariadb client library that is LGPLv2. I'm not entirely sure if this new mariadb client library is the one that is actually used by applications that link with libmysql_client. If not, or if the old mysql client library is still installed to target, then we have to add the three licenses.

See https://mariadb.com/kb/en/mariadb/mariadb-license/ for more details.

Quoted 6 lines

package/mysql/mysql.mk line 32

Quoted 4 lines

package/mysql/mysql.mk +4 -0

+# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken
+# when it comes to cross-compilation we shall disable it and also disable TokuDB.
+MYSQL_OPTS += -DWITH_JEMALLOC=no
+MYSQL_OPTS += -DWITHOUT_TOKUDB=1  

One line is probably enough for both.

Well, since there are a lot more += -D options, I kind of like it like this.
Principle of least surprise.

Quoted 4 lines

Are these all needed?

Also, we prefer:

Quoted 6 lines

MYSQL_OPTS += \
	-DFOO=baz \
	-DBAR=foo \
	-Dthis=that

when there are multiple options to assign.

Ah, do we? :-)

Quoted 6 lines

Quoted 6 lines

package/mysql/mysql.mk +6 -0

+# 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
+# generated during the build of the host helpers. It is not necessary to build
+# the whole host package, only the "import_executables" target.
+# -DIMPORT_EXECUTABLES=$(BUILD_DIR)/host-mariadb-galera/import_executables.cmake
+# must then be passed to cmake during target build.

Quoted 8 lines

package/mysql/mysql.mk line 80

Quoted 2 lines

package/mysql/mysql.mk +2 -0

+HOST_MYSQL_MAKE_OPTS = import_executables
+MYSQL_IMPORT_EXECUTABLES += -DIMPORT_EXECUTABLES=$(HOST_MYSQL_BUILDDIR)/import_executables.cmake  

I'm not sure why this import_executables.cmake file contains, but we generally don't like accessing stuff from a build directory during the build of another package. The host-mysql package is supposed to install things in $(HOST_DIR), and the target mysql package to use them from $(HOST_DIR).

As I understand it from
https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/
you basically need a configure-hostbuild-configure-build chain for cross-compiling. The binaries generated during the hostbuild are not meant to be used outside of the mariadb build process itself, so it really makes no sense to make it a host package IMHO. I think it's better to do the hostbuild in a pre-configure hook.

Problem with that is that
* the pre-configure hook will also build stuff;
* the cmake call in the pre-configure hook will also have to pass some/most/all of the -D arguments we pass in a host-cmake package's _CONFIGURE_CMDS. The first point is not so important IMHO. For the second one, it would be convenient if we would define a HOST/TARGET_CMAKE_CONF_OPTS variable that contains all these common options.

Isn't part of the original idea of MariaDB to avoid the GPL-licensed client library so that proprietary applications can link with the client library without having to purchase a MySQL license?

Hello,

Quoted 7 lines · Ryan Coe

Replaces the old mysql 5.1 with mariadb 10.1. The package was not renamed as mariadb is a drop-in replacement for mysql.

Based on the work by:
Sylvain Raybaud <[email protected]>
https://patchwork.ozlabs.org/patch/538045/

Quoted 1 line

Signed-off-by Ryan Coe <[email protected]>

I don't know if I like the fact that we're hi-jacking the mysql package here. Maybe this should be added as a separate package/mariadb/ package, and then the mysql package changed to a virtual package afterwards, in a second patch?

This would also have the benefit of making this patch easier to review.

Quoted 21 lines

package/mysql/0001-add-extra-check-for-librt.patch new file +14 -0

new file mode 100644
index 0000000..aea7064
@@ -0,0 +1,26 @@
+From 31094bd1fcccba2fb8b234735bb9bf60ba4afa28 Mon Sep 17 00:00:00 2001
+From: Ryan Coe <[email protected]>
+Date: Sun, 18 Sep 2016 16:35:59 -0700
+Subject: [PATCH 1/1] add extra check for librt
+
+Signed-off-by: Ryan Coe <[email protected]>
+---
+ configure.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.cmake b/configure.cmake
+index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644
+--- a/configure.cmake
++++ b/configure.cmake

package/mysql/0001-add-extra-check-for-librt.patch line 21

Quoted 7 lines

package/mysql/0001-add-extra-check-for-librt.patch new file +7 -0

+@@ -126,6 +126,9 @@ IF(UNIX)
+   IF(NOT LIBRT)
+     MY_SEARCH_LIBS(clock_gettime rt LIBRT)
+   ENDIF()
++  IF(NOT LIBRT)
++    MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT)
++  ENDIF()

Please remember to send this patch to the upstream MariaDB project.

package/mysql/Config.in line 6

Quoted 13 lines

package/mysql/Config.in +2 -1

index 7133892..f1b70db 100644
@@ -1,24 +1,30 @@
  config BR2_PACKAGE_MYSQL
-	bool "MySQL"
+	bool "mariadb"
  	depends on BR2_INSTALL_LIBSTDCPP
  	depends on BR2_USE_MMU # fork()
  	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBAIO

Then you need to:

depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS

package/mysql/Config.in line 7

Quoted 2 lines

package/mysql/Config.in +1 -0

+	select BR2_PACKAGE_LIBTOOL

Are you sure you need libtool on the target? This seems odd.

package/mysql/Config.in line 29

Quoted 4 lines

package/mysql/Config.in +1 -1

-comment "MySQL needs a toolchain w/ C++, threads"
+comment "mariadb needs a toolchain w/ C++, threads"
  	depends on BR2_USE_MMU

depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS

Quoted 13 lines

package/mysql/Config.in +11 -0

  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+MYSQL_LIB="/var/lib/mysql"
+MYSQL_RUN="/run/mysqld"
+MYSQL_PID="$MYSQL_RUN/mysqld.pid"
+
+wait_for_pid() {
+	WAIT_DELAY=10
+	if [ ! -e $MYSQL_PID ]; then
+		while [ $WAIT_DELAY -gt 0 ]; do
+			if [ -e $MYSQL_PID ]; then
+				return 0
+			fi

package/mysql/Config.in line 28

Quoted 7 lines

package/mysql/Config.in +7 -0

+			sleep 1
+			: $((WAIT_DELAY -= 1))
+		done
+		return 1
+	fi
+	return 0
+}

Do we really need something like this?

Quoted 13 lines

package/mysql/mysql.mk +1 -1

index 7af4711..0c05162 100644
@@ -1,110 +1,98 @@
  ################################################################################
  #
-# mysql
+# mariadb
  #
  ################################################################################
 

package/mysql/mysql.mk line 10

Quoted 11 lines

package/mysql/mysql.mk +3 -7

-MYSQL_VERSION_MAJOR = 5.1
-MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).73
-MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz
-MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_VERSION_MAJOR)
-MYSQL_INSTALL_STAGING = YES
-MYSQL_DEPENDENCIES = readline ncurses
-MYSQL_AUTORECONF = YES
+MYSQL_VERSION = 10.1.17
+MYSQL_SOURCE = mariadb-$(MYSQL_VERSION).tar.gz
+MYSQL_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MYSQL_VERSION)/source
  MYSQL_LICENSE = GPLv2

Are you sure this license is correct? I believe mariadb is partly under LGPLv2, no?

package/mysql/mysql.mk line 32

Quoted 5 lines

package/mysql/mysql.mk +4 -0

+# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken
+# when it comes to cross-compilation we shall disable it and also disable TokuDB.
+MYSQL_OPTS += -DWITH_JEMALLOC=no
+MYSQL_OPTS += -DWITHOUT_TOKUDB=1

One line is probably enough for both.

package/mysql/mysql.mk line 46

Quoted 2 lines

package/mysql/mysql.mk +1 -0

+MYSQL_OPTS += -DCMAKE_BUILD_TYPE=Release

Not needed, already passed by Buildroot in pkg-cmake.mk.

package/mysql/mysql.mk line 47

Quoted 2 lines

package/mysql/mysql.mk +1 -0

+MYSQL_OPTS += -DCMAKE_INSTALL_PREFIX=/usr

Not needed, already passed by Builroot in pkg-cmake.mk.

package/mysql/mysql.mk line 57

Quoted 11 lines

package/mysql/mysql.mk +10 -0

+MYSQL_OPTS += -DINSTALL_DOCDIR=share/doc/mariadb-$(MYSQL_VERSION)
+MYSQL_OPTS += -DINSTALL_DOCREADMEDIR=share/doc/mariadb-$(MYSQL_VERSION)
+MYSQL_OPTS += -DINSTALL_MANDIR=share/man
+MYSQL_OPTS += -DINSTALL_MYSQLSHAREDIR=share/mysql
+MYSQL_OPTS += -DINSTALL_MYSQLTESTDIR=share/mysql/test
+MYSQL_OPTS += -DINSTALL_PLUGINDIR=lib/mysql/plugin
+MYSQL_OPTS += -DINSTALL_SBINDIR=sbin
+MYSQL_OPTS += -DINSTALL_SCRIPTDIR=bin
+MYSQL_OPTS += -DINSTALL_SQLBENCHDIR=share/mysql/bench
+MYSQL_OPTS += -DINSTALL_SUPPORTFILESDIR=share/mysql

Are these all needed?

Also, we prefer:

MYSQL_OPTS += \
	-DFOO=baz \
	-DBAR=foo \
	-Dthis=that

when there are multiple options to assign.

package/mysql/mysql.mk line 68

Quoted 9 lines

package/mysql/mysql.mk +8 -0

+MYSQL_DEPENDENCIES = \
+	host-mysql \
+	ncurses \
+	openssl \
+	zlib \
+	libaio \
+	libxml2 \
+	libtool \

You really need libtool?

package/mysql/mysql.mk line 71

Quoted 4 lines

package/mysql/mysql.mk +3 -0

+	readline
+
+HOST_MYSQL_DEPENDENCIES =

Not needed.

package/mysql/mysql.mk line 80

Quoted 9 lines

package/mysql/mysql.mk +8 -0

+# 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
+# generated during the build of the host helpers. It is not necessary to build
+# the whole host package, only the "import_executables" target.
+# -DIMPORT_EXECUTABLES=$(BUILD_DIR)/host-mariadb-galera/import_executables.cmake
+# must then be passed to cmake during target build.
+HOST_MYSQL_MAKE_OPTS = import_executables
+MYSQL_IMPORT_EXECUTABLES += -DIMPORT_EXECUTABLES=$(HOST_MYSQL_BUILDDIR)/import_executables.cmake

I'm not sure why this import_executables.cmake file contains, but we generally don't like accessing stuff from a build directory during the build of another package. The host-mysql package is supposed to install things in $(HOST_DIR), and the target mysql package to use them from $(HOST_DIR).

package/mysql/mysql.mk line 47

Quoted 2 lines

package/mysql/mysql.mk +2 -0

+
+HOST_MYSQL_CONF_OPTS = $(MYSQL_OPTS)

This seems very wrong, a MYSQL_OPTS is for the target. As an example, the host should be configured with CMAKE_INSTALL_PREFIX=$(HOST_DIR)/usr. Please use an explicit value for HOST_MYSQL_CONF_OPTS, with only the necessary options.

package/mysql/mysql.mk line 83

Quoted 1 line

package/mysql/mysql.mk +1 -0

+HOST_MYSQL_CONF_OPTS += $(MYSQL_HOST_OPTS)

Why do we have an intermediate MYSQL_HOST_OPTS variable then, rather than using HOST_MYSQL_CONF_OPTS directly?

package/mysql/mysql.mk line 50

Quoted 2 lines

package/mysql/mysql.mk +2 -0

+
+MYSQL_CONF_OPTS = $(MYSQL_OPTS)

Why do we have an intermediate MYSQL_OPTS variable? Just use MYSQL_CONF_OPTS directly.

package/mysql/mysql.mk line 86

Quoted 1 line

package/mysql/mysql.mk +1 -0

+MYSQL_CONF_OPTS += $(MYSQL_IMPORT_EXECUTABLES)

Intermediate variable not needed.

package/mysql/mysql.mk line 90

Quoted 5 lines

package/mysql/mysql.mk +4 -0

+
+# Don't install host-mysql. We just need to build import_executable
+# Therefore only run 'true' and do nothing, not even the default action.
+HOST_MYSQL_INSTALL_CMDS = true

This would be the place where you could install the host-mysql stuff in $(HOST_DIR).

package/mysql/mysql.mk line 57

Quoted 3 lines

package/mysql/mysql.mk +1 -1

  [Service]
-ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql'
+ExecStartPre=/bin/sh -c '[ "`ls -1 /var/lib/mysql | wc -l`" = "0" ] && mysql_install_db --basedir=/usr --datadir=/var/lib/mysql'

Why is the test on /var/mysql/mysql existence no longer good enough? It was much nicer than the test of the number of files in this directory.

Thanks for this effort, it is much appreciated that someone takes care of updating this complicated package.

Thanks!

Thomas

This patch represents my attempt to replace the aging mysql 5.1 that is currently shipped with Buildroot. I am replacing mysql altogether with mariadb version 10.1. I have been able to test this with both an arm and a x86_64 build, and it has also been tested with glibc and uclibc. I have not tested it with systemd.

# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken

# when it comes to cross-compilation we shall disable it and also 
disable TokuDB.
MYSQL_OPTS += -DWITH_JEMALLOC=no
MYSQL_OPTS += -DWITHOUT_TOKUDB=1

wait_for_pid() {
WAIT_DELAY=10
if [ ! -e $MYSQL_PID ]; then
while [ $WAIT_DELAY -gt 0 ]; do
if [ -e $MYSQL_PID ]; then
return 0

fi
sleep 1
: $((WAIT_DELAY -= 1))
done
return 1
fi
return 0
}

This patch represents my attempt to replace the aging mysql 5.1 that is currently shipped with Buildroot. I am replacing mysql altogether with mariadb version 10.0. I have been able to test this with both an arm and a x86_64 build. I have not tested it with systemd. This patch is based on the work done by Sylvain Raybaud.

Quoted 5 lines · Ryan Coe

This patch represents my attempt to replace the aging mysql 5.1 that is currently shipped with Buildroot. I am replacing mysql altogether with mariadb version 10.0. I have been able to test this with both an arm and a x86_64 build. I have not tested it with systemd. This patch is based on the work done by Sylvain Raybaud.

Would it be better to just add MariaDB rather than replace MySQL, there's reasons to use one over the other.

Would it be better to just add MariaDB rather than replace MySQL, there's reasons to use one over the other.