Set of patches to add MariaDB galera cluster

Add package check: a unit test library.

Signed-off-by Sylvain Raybaud <[email protected]>

---

Changes v1 -> v2:
- Fixed Config.in (suggested by Yann E. Morin)
- Fixed hash file (suggested by Yann E. Morin)
- Changed dependency from pgkconf to host-pkgconf (suggested by Yann E. Morin)
- Fixed license (suggested by Yann E. Morin)
- Leave CHECK_INSTALL_STAGING and CHECK_INSTALL_TARGET to their default values (suggested by Yann E. Morin)

 package/Config.in        |  1 +
 package/check/Config.in  |  7 +++++++
 package/check/check.hash |  2 ++
 package/check/check.mk   | 17 +++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 package/check/Config.in
 create mode 100644 package/check/check.hash
 create mode 100644 package/check/check.mk

package/Config.in +1 -0

index 13a7e74..72ec372 100644
@@ -1014,6 +1014,7 @@ menu "Other"
 	source "package/atf/Config.in"
 	source "package/bdwgc/Config.in"
 	source "package/boost/Config.in"
+	source "package/check/Config.in"
 	source "package/clapack/Config.in"
 	source "package/classpath/Config.in"
 	source "package/cppcms/Config.in"

package/check/Config.in new file +7 -0

new file mode 100644
index 0000000..4bdb4c8
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_CHECK
+	bool "check"
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_PKGCONF
+	help
+	  Unit testing framework for C
+	  http://check.sourceforge.net/

package/check/check.hash new file +2 -0

new file mode 100644
index 0000000..8ade191
@@ -0,0 +1,2 @@
+# Locally computed:
+sha1	4b79e2d485d014ddb438e322b64235347d57b0ff	check-0.9.14.tar.gz

package/check/check.mk new file +17 -0

new file mode 100644
index 0000000..83fd4fb
@@ -0,0 +1,17 @@
+################################################################################
+#
+# check
+#
+################################################################################
+
+CHECK_VERSION = 0.9.14
+CHECK_SOURCE = check-$(CHECK_VERSION).tar.gz
+CHECK_SITE = http://downloads.sourceforge.net/project/check/check/$(CHECK_VERSION)/
+
+CHECK_DEPENDENCIES = libtool host-pkgconf
+
+CHECK_LICENSE =  LGPLv2.1+
+CHECK_LICENSE_FILES = COPYING.LESSER
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

Signature · 6 lines

1.9.1

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

host-libaio is needed to build host-mysql in its mariadb variant which is needed to build the target variant of mariadb.

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
Explain why we need to build host-libaio in commit log (suggested by Yann E. Morin)

 package/libaio/libaio.mk | 1 +
 1 file changed, 1 insertion(+)

package/libaio/libaio.mk +1 -0

index 53ad7eb..55e2cc7 100644
@@ -24,3 +24,4 @@ define LIBAIO_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
+$(eval $(host-generic-package))

Signature · 6 lines

1.9.1

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

On 2015-07-09 18:21 +0200, Sylvain Raybaud spake thusly:

Quoted 1 line

host-libaio is needed to build host-mysql in its mariadb variant which is needed to build the target variant of mariadb.

Commit logs should be limited to ~80 chars. Otherwise:

Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
Explain why we need to build host-libaio in commit log (suggested by Yann E. Morin)

 package/libaio/libaio.mk | 1 +
 1 file changed, 1 insertion(+)

package/libaio/libaio.mk +1 -0

index 53ad7eb..55e2cc7 100644
@@ -24,3 +24,4 @@ define LIBAIO_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
+$(eval $(host-generic-package))

Signature · 6 lines

1.9.1

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

Signature · 10 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

host-libaio is needed to build host-mysql in its mariadb variant which is needed to build the target variant of mariadb.

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
Explain why we need to build host-libaio in commit log (suggested by Yann E. Morin)

 package/libaio/libaio.mk | 1 +
 1 file changed, 1 insertion(+)

package/libaio/libaio.mk +0 -0

index 53ad7eb..55e2cc7 100644

Add package galera: wsrep provider for MySQL and MariaDB galera cluster.

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
- Remove duplicated block in package/galera/galera.mk

 package/Config.in                                  |  1 +
 package/galera/Config.in                           |  9 ++++
 ...lera-01-fix_sconstruct_for-crosscompiling.patch | 52 ++++++++++++++++++++++
 package/galera/galera.hash                         |  2 +
 package/galera/galera.mk                           | 49 ++++++++++++++++++++
 5 files changed, 113 insertions(+)
 create mode 100644 package/galera/Config.in
 create mode 100644 package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch
 create mode 100644 package/galera/galera.hash
 create mode 100644 package/galera/galera.mk

package/Config.in +1 -0

index 72ec372..b15d026 100644
@@ -740,6 +740,7 @@ menu "Database"
        source "package/cppdb/Config.in"
        source "package/gdbm/Config.in"
        source "package/leveldb/Config.in"
+       source "package/galera/Config.in"
        source "package/mysql/Config.in"
        source "package/postgresql/Config.in"
        source "package/redis/Config.in"

package/galera/Config.in new file +9 -0

new file mode 100644
index 0000000..4c50427
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GALERA
+       bool "galera"
+       select BR2_PACKAGE_BOOST
+       select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+       select BR2_PACKAGE_OPENSSL
+       select BR2_PACKAGE_CHECK
+       help
+         Galera WSREP provider
+         http://galeracluster.com/

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch new file +40 -0

new file mode 100644
index 0000000..25c9d59
@@ -0,0 +1,52 @@
+Fix cross compilation
+
+--- a/SConstruct       2015-05-28 12:23:41.027461788 +0200
++++ b/SConstruct       2015-07-02 11:27:55.763337287 +0200
+@@ -15,18 +15,17 @@
+ ####################################################################
+
+ import os
+-import platform
+ import string
+
+-sysname = os.uname()[0].lower()
+-machine = platform.machine()
+-bits = platform.architecture()[0]
++sysname = "linux"
++machine = os.environ['BR2_ARCH']
++bits = os.environ['BR2_x86']
+ print 'Host: ' + sysname + ' ' + machine + ' ' + bits
+
+ x86 = 0
+-if bits == '32bit':
++if bits == '32':
+     x86 = 32
+-elif bits == '64bit':
++elif bits == '64':
+     x86 = 64
+
+
+@@ -240,6 +239,15 @@
+ #
+ env.Append(LINKFLAGS = link_arch)
+
++# Cross-compilation
++
++if 'CROSS' in os.environ:
++        cross = os.environ['CROSS']
++        env.Append(CROSS = cross)
++        env.Replace(CC = cross + 'gcc')
++        env.Replace(CXX = cross + 'g++')
++        env.Replace(LD = cross + 'ld')

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch new file +2 -0

+     conf.env.Append(CCFLAGS  = ' -pedantic')
+     conf.env.Append(CXXFLAGS = ' -Weffc++ -Wold-style-cast')

package/galera/galera.hash new file +2 -0

new file mode 100644
index 0000000..d3872e1
@@ -0,0 +1,2 @@
+# From http://releases.galeracluster.com/source/galera-3-25.3.10.tar.gz
+sha1   03f69fa87dc14fa4d793e7afab601e285c570809        galera-3-25.3.10.tar.gz

package/galera/galera.mk new file +10 -0

new file mode 100644
index 0000000..f9bf0d0
@@ -0,0 +1,49 @@
+################################################################################
+#
+# galera
+#
+################################################################################
+
+GALERA_VERSION = 3-25.3.10
+GALERA_SOURCE = galera-$(GALERA_VERSION).tar.gz
+GALERA_SITE = http://releases.galeracluster.com/source/
+

Hi Sylvain,

Quoted 82 lines · Sylvain Raybaud

Add package galera: wsrep provider for MySQL and MariaDB galera cluster.

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
- Remove duplicated block in package/galera/galera.mk

 package/Config.in                                  |  1 +
 package/galera/Config.in                           |  9 ++++
 ...lera-01-fix_sconstruct_for-crosscompiling.patch | 52 ++++++++++++++++++++++
 package/galera/galera.hash                         |  2 +
 package/galera/galera.mk                           | 49 ++++++++++++++++++++
 5 files changed, 113 insertions(+)
 create mode 100644 package/galera/Config.in
 create mode 100644 package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch
 create mode 100644 package/galera/galera.hash
 create mode 100644 package/galera/galera.mk

package/Config.in +1 -0

index 72ec372..b15d026 100644
@@ -740,6 +740,7 @@ menu "Database"
        source "package/cppdb/Config.in"
        source "package/gdbm/Config.in"
        source "package/leveldb/Config.in"
+       source "package/galera/Config.in"
        source "package/mysql/Config.in"
        source "package/postgresql/Config.in"
        source "package/redis/Config.in"

package/galera/Config.in new file +9 -0

new file mode 100644
index 0000000..4c50427
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GALERA
+       bool "galera"
+       select BR2_PACKAGE_BOOST
+       select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+       select BR2_PACKAGE_OPENSSL
+       select BR2_PACKAGE_CHECK
+       help
+         Galera WSREP provider
+         http://galeracluster.com/

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch new file +31 -0

new file mode 100644
index 0000000..25c9d59
@@ -0,0 +1,52 @@
+Fix cross compilation
+
+--- a/SConstruct       2015-05-28 12:23:41.027461788 +0200
++++ b/SConstruct       2015-07-02 11:27:55.763337287 +0200
+@@ -15,18 +15,17 @@
+ ####################################################################
+
+ import os
+-import platform
+ import string
+
+-sysname = os.uname()[0].lower()
+-machine = platform.machine()
+-bits = platform.architecture()[0]
++sysname = "linux"
++machine = os.environ['BR2_ARCH']
++bits = os.environ['BR2_x86']
+ print 'Host: ' + sysname + ' ' + machine + ' ' + bits
+
+ x86 = 0
+-if bits == '32bit':
++if bits == '32':
+     x86 = 32
+-elif bits == '64bit':
++elif bits == '64':
+     x86 = 64
+
+
+@@ -240,6 +239,15 @@
+ #
+ env.Append(LINKFLAGS = link_arch)

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch line 39

Quoted 8 lines

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch new file +8 -0

+
++# Cross-compilation
++
++if 'CROSS' in os.environ:
++        cross = os.environ['CROSS']
++        env.Append(CROSS = cross)
++        env.Replace(CC = cross + 'gcc')
++        env.Replace(CXX = cross + 'g++')

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch line 50

Quoted 11 lines

package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch new file +11 -0

++        env.Replace(LD = cross + 'ld')
++
+ #
+ # Check required headers and libraries (autoconf functionality)
+ #
+@@ -405,7 +413,7 @@
+
+ # these will be used only with our softaware
+ if strict_build_flags == 1:
+-    conf.env.Append(CPPFLAGS = ' -Werror')
++    conf.env.Append(CPPFLAGS = ' -Werror -Wno-error=uninitialized -Wno-error=pedantic')

Hum... -Werror is more a development flag than an integration one. It should certainly be removed.

Quoted 5 lines · Samuel Martin

Quoted 5 lines

diff --git a/package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch b/package/galera/galera-01-fix_sconstruct_for-crosscompiling.patch

Quoted 4 lines

Quoted 4 lines

++# Cross-compilation ++ ++if 'CROSS' in os.environ: ++
cross = os.environ['CROSS'] ++ env.Append(CROSS =
cross) ++ env.Replace(CC = cross + 'gcc') ++
env.Replace(CXX = cross + 'g++')

This means ccache will not be used. We prefer to pass CC and CXX in the environment (through TARGET_CONFIGURE_OPTS). I think that would even work out of the box without any patch, no?

Quoted 6 lines

Review

Quoted 4 lines

+ # these will be used only with our softaware + if
strict_build_flags == 1: +- conf.env.Append(CPPFLAGS = '

(quoted diff) +0 -2

-Werror') ++    conf.env.Append(CPPFLAGS = ' -Werror
-Wno-error=uninitialized -Wno-error=pedantic')

Hum... -Werror is more a development flag than an integration one. It should certainly be removed.

Better yet, make sure the strict_build_flags is not set.

Regards, Arnout

[snip]

Review

Quoted 4 lines

+ + # these will be used only with our softaware + if
strict_build_flags == 1: +- conf.env.Append(CPPFLAGS = '

(quoted diff) +0 -2

-Werror') ++    conf.env.Append(CPPFLAGS = ' -Werror
-Wno-error=uninitialized -Wno-error=pedantic')

Hum... -Werror is more a development flag than an integration one. It should certainly be removed.

Quoted 3 lines

+GALERA_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) BR2_ARCH=$(BR2_ARCH) +ifeq ($(BR2_x86_64),y) +GALERA_SCONS_ENV += BR2_x86=64

BR2_ prefix is usually reserved for buildroot scope. Maybe this variable could be rename GALERA_BITWISE instead of BR2_x86?

Review

Quoted 3 lines

(quoted diff) +2 -0

+else ifeq ($(BR2_i386),y) +GALERA_SCONS_ENV += BR2_x86=32 +else 
+GALERA_SCONS_ENV += BR2_x86=0

Hum... looks dubious! Does this mean that galera is only available for x86 and x86_64 target? Other architectures can also be available in 32bits and 64bits (arm/aarch64, mips/mips64, etc). Last thing, the variable BR2_ARCH_IS_64 is set when the bitwise is 64bit, whatever the CPU architecture, so prefer using it.

Quoted 2 lines

+ +define GALERA_BUILD_CMDS + cd $(@D) && \ +
$(GALERA_SCONS_ENV) \ + CROSS=$(TARGET_CROSS) \

CROSS=... can be appended to the GALERA_SCONS_ENV variable.

Quoted 1 line

+$(eval $(generic-package)) +$(eval $(host-generic-package))

Why a host-galera package? Note that, as is, this host-galera package will build/install nothing because of the generic infra used without any HOST_GALERA_*_CMDS definition.

Regards,

Signed-off-by Sylvain Raybaud <[email protected]>

---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)

package/pkg-cmake.mk +0 -0

index f17a883..a757a2b 100644

package/pkg-cmake.mk +0 -1

        $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
                -DCMAKE_INSTALL_SO_NO_EXE=0 \
                -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
--

1.9.1

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

Set CONFIGURE_FEATURE_FANCY_SLEEP and CONFIG_FEATURE_FLOAT_SLEEP so that sleep accept floating point arguments. This add 492 bytes to the busybox binary compiled for arm or 2748 bytes when compiled for i386.

Signed-off-by Sylvain Raybaud <[email protected]>

Set CONFIGURE_FEATURE_FANCY_SLEEP and CONFIG_FEATURE_FLOAT_SLEEP so that sleep accept floating point arguments. This add 492 bytes to the busybox binary compiled for arm or 2748 bytes when compiled for i386.

Signed-off-by Sylvain Raybaud <[email protected]>

---
Changes v1 -> v2:
- Add information about the impact on busybox binary size induced by patching busybox.config (suggested by Thomas Petazzoni)

Dear Sylvain Raybaud,

Quoted 9 lines · Sylvain Raybaud

Set CONFIGURE_FEATURE_FANCY_SLEEP and CONFIG_FEATURE_FLOAT_SLEEP so that sleep accept floating point arguments. This add 492 bytes to the busybox binary compiled for arm or 2748 bytes when compiled for i386.

Signed-off-by: Sylvain Raybaud <[email protected]> --- Changes v1 -> v2: - Add information about the impact on busybox binary size induced by patching busybox.config (suggested by Thomas Petazzoni)

Applied, thanks.

Next time, can you remember to wrap your commit log to ~72 columns?

Thanks!

Signed-off-by Sylvain Raybaud <[email protected]>

---
 .../mariadb-galera-01-fix_xtradb_cmakelist.patch   |  27 +++
 .../mariadb-galera-02-fix_innodb_cmakelist.patch   | 251 +++++++++++++++++++++
 package/mysql/Config.in                            |  43 +++-
 package/mysql/mariadb-galera-cluster.cnf           | 204 +++++++++++++++++
 package/mysql/mysql.hash                           |   2 +
 package/mysql/mysql.mk                             | 216 +++++++++++++++---
 6 files changed, 707 insertions(+), 36 deletions(-)
 create mode 100644 package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch
 create mode 100644 package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch
 create mode 100644 package/mysql/mariadb-galera-cluster.cnf

package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch new file +0 -0

new file mode 100644
index 0000000..83eac77

package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch new file +4 -0

+--- a/storage/xtradb/CMakeLists.txt    2014-10-30 16:24:33.160188627 +0100
++++ b/storage/xtradb/CMakeLists.txt    2014-10-30 16:25:09.060188829 +0100
+@@ -470,12 +470,13 @@
+   SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)

package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch new file +10 -0

++  IF(XTRADB_OK)
++    MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
++      DEFAULT
++      RECOMPILE_FOR_EMBEDDED
++      LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
++  ELSE()
++    MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
++  ENDIF()
+ ENDIF()
+-

package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch new file +0 -0

new file mode 100644
index 0000000..1ddec5d

package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch new file +245 -0

+--- a/storage/innobase/CMakeLists.txt  2014-11-07 17:05:48.853208487 +0100
++++ b/storage/innobase/CMakeLists.txt  2014-11-07 17:11:38.061217839 +0100
+@@ -58,100 +58,99 @@
+
+ IF(NOT MSVC)
+ # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+-IF(NOT CMAKE_CROSSCOMPILING)
+-  # workaround for gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686
+-  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND CMAKE_COMPILER_IS_GNUCC AND
+-     CMAKE_C_COMPILER_VERSION VERSION_LESS "4.1.3")
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686")
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686")
+-  ENDIF()
+-  CHECK_C_SOURCE_RUNS(
+-  "
+-  int main()
+-  {
+-    long      x;
+-    long      y;
+-    long      res;
+-
+-    x = 10;
+-    y = 123;
+-    res = __sync_bool_compare_and_swap(&x, x, y);
+-    if (!res || x != y) {
+-      return(1);
+-    }
+-
+-    x = 10;
+-    y = 123;
+-    res = __sync_bool_compare_and_swap(&x, x + 1, y);
+-    if (res || x != 10) {
+-      return(1);
+-    }
+-    x = 10;
+-    y = 123;
+-    res = __sync_add_and_fetch(&x, y);
+-    if (res != 123 + 10 || x != 123 + 10) {
+-      return(1);
+-    }
+-    return(0);
+-  }"
+-  HAVE_IB_GCC_ATOMIC_BUILTINS
+-  )
+-  CHECK_C_SOURCE_RUNS(
+-  "
+-  int main()
+-  {
+-    long      res;
+-    char      c;
+-
+-    c = 10;
+-    res = __sync_lock_test_and_set(&c, 123);
+-    if (res != 10 || c != 123) {
+-      return(1);
+-    }
+-    return(0);
+-  }"
+-  HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
+-  )
+-  CHECK_C_SOURCE_RUNS(
+-  "#include<stdint.h>
+-  int main()
+-  {
+-    int64_t   x,y,res;
+-
+-    x = 10;
+-    y = 123;
+-    res = __sync_sub_and_fetch(&y, x);
+-    if (res != y || y != 113) {
+-      return(1);
+-    }
+-    res = __sync_add_and_fetch(&y, x);
+-    if (res != y || y != 123) {
+-      return(1);
+-    }
+-    return(0);
+-  }"
+-  HAVE_IB_GCC_ATOMIC_BUILTINS_64
+-  )
+-  CHECK_C_SOURCE_RUNS(
+-  "#include<stdint.h>
+-  int main()
+-  {
+-    __sync_synchronize();
+-    return(0);
+-  }"
+-  HAVE_IB_GCC_SYNC_SYNCHRONISE
+-  )
+-  CHECK_C_SOURCE_RUNS(
+-  "#include<stdint.h>
+-  int main()
+-  {
+-    __atomic_thread_fence(__ATOMIC_ACQUIRE);
+-    __atomic_thread_fence(__ATOMIC_RELEASE);
+-    return(0);
+-  }"
+-  HAVE_IB_GCC_ATOMIC_THREAD_FENCE
+-  )
+-ENDIF()
++
++# workaround for gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686
++IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND CMAKE_COMPILER_IS_GNUCC AND
++   CMAKE_C_COMPILER_VERSION VERSION_LESS "4.1.3")
++  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686")
++  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686")
++ENDIF()
++CHECK_C_SOURCE_COMPILES(
++"
++int main()
++{
++  long        x;
++  long        y;
++  long        res;
++
++  x = 10;
++  y = 123;
++  res = __sync_bool_compare_and_swap(&x, x, y);
++  if (!res || x != y) {
++    return(1);
++  }
++
++  x = 10;
++  y = 123;
++  res = __sync_bool_compare_and_swap(&x, x + 1, y);
++  if (res || x != 10) {
++    return(1);
++  }
++  x = 10;
++  y = 123;
++  res = __sync_add_and_fetch(&x, y);
++  if (res != 123 + 10 || x != 123 + 10) {
++    return(1);
++  }
++  return(0);
++}"
++HAVE_IB_GCC_ATOMIC_BUILTINS
++)
++CHECK_C_SOURCE_COMPILES(
++"
++int main()
++{
++  long        res;
++  char        c;
++
++  c = 10;
++  res = __sync_lock_test_and_set(&c, 123);
++  if (res != 10 || c != 123) {
++    return(1);
++  }
++  return(0);
++}"
++HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
++)
++CHECK_C_SOURCE_COMPILES(
++"#include<stdint.h>
++int main()
++{
++  int64_t     x,y,res;
++
++  x = 10;
++  y = 123;
++  res = __sync_sub_and_fetch(&y, x);
++  if (res != y || y != 113) {
++    return(1);
++  }
++  res = __sync_add_and_fetch(&y, x);
++  if (res != y || y != 123) {
++    return(1);
++  }
++  return(0);
++}"
++HAVE_IB_GCC_ATOMIC_BUILTINS_64
++)
++CHECK_C_SOURCE_COMPILES(
++"#include<stdint.h>
++int main()
++{
++  __sync_synchronize();
++  return(0);
++}"
++HAVE_IB_GCC_SYNC_SYNCHRONISE
++)
++CHECK_C_SOURCE_COMPILES(
++"#include<stdint.h>
++int main()
++{
++  __atomic_thread_fence(__ATOMIC_ACQUIRE);
++  __atomic_thread_fence(__ATOMIC_RELEASE);
++return(0);
++}"
++HAVE_IB_GCC_ATOMIC_THREAD_FENCE
++)
+
+ IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
+  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
+@@ -173,28 +172,26 @@
+  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_THREAD_FENCE=1)
+ ENDIF()
+
+- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+-IF(NOT CMAKE_CROSSCOMPILING)
+-  CHECK_C_SOURCE_RUNS(
+-  "
+-  #include <pthread.h>
+-  #include <string.h>
+-
+-  int main() {
+-    pthread_t       x1;
+-    pthread_t       x2;
+-    pthread_t       x3;
+-
+-    memset(&x1, 0x0, sizeof(x1));
+-    memset(&x2, 0x0, sizeof(x2));
+-    memset(&x3, 0x0, sizeof(x3));
+-
+-    __sync_bool_compare_and_swap(&x1, x2, x3);
+-
+-    return(0);
+-  }"
+-  HAVE_IB_ATOMIC_PTHREAD_T_GCC)
+-ENDIF()
++# either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
++CHECK_C_SOURCE_COMPILES(
++"
++#include <pthread.h>
++#include <string.h>
++
++int main() {
++  pthread_t       x1;
++  pthread_t       x2;
++  pthread_t       x3;
++
++  memset(&x1, 0x0, sizeof(x1));
++  memset(&x2, 0x0, sizeof(x2));
++  memset(&x3, 0x0, sizeof(x3));
++  __sync_bool_compare_and_swap(&x1, x2, x3);
++
++  return(0);
++}"
++HAVE_IB_ATOMIC_PTHREAD_T_GCC)
++
+ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
+   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
+ ENDIF()

package/mysql/Config.in +3 -0

index 7133892..a1a2d23 100644
@@ -1,8 +1,17 @@
 config BR2_PACKAGE_MYSQL
+       bool "mysql"
+
+if BR2_PACKAGE_MYSQL

package/mysql/Config.in +4 -1

        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_READLINE
        help

@@ -10,7 +19,35 @@ config BR2_PACKAGE_MYSQL
 
          http://www.mysql.com/
 
-if BR2_PACKAGE_MYSQL
+config MYSQL_MARIADB_GALERA
+       bool "mariadb-galera"
+       select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_OPENSSL

package/mysql/mariadb-galera-cluster.cnf new file +204 -0

new file mode 100644
index 0000000..c3eddaa
@@ -0,0 +1,204 @@
+# MariaDB database server configuration file.
+#
+# You can copy this file to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port           = 3306
+socket         = /tmp/mysql.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         = /tmp/mysql.sock
+nice           = 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+user           = mysql
+pid-file       = /tmp/mysql.pid
+socket         = /tmp/mysql.sock
+port           = 3306
+basedir                = /usr
+datadir                = /var/lib/mysql
+tmpdir         = /tmp
+lc_messages_dir        = /usr/share/
+lc_messages    = en_US
+skip-external-locking
+
+# Don't use DNS as it may not be available
+skip-host-cache
+skip-name-resolve
+
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+#bind-address          = 127.0.0.1
+#
+# * Fine Tuning
+#
+max_connections                = 100
+connect_timeout                = 5
+wait_timeout           = 600
+max_allowed_packet     = 16M
+thread_cache_size       = 128
+sort_buffer_size       = 4M
+bulk_insert_buffer_size        = 16M
+tmp_table_size         = 32M
+max_heap_table_size    = 32M
+#
+# * MyISAM
+#
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched. On error, make copy and try a repair.
+myisam_recover          = BACKUP
+key_buffer_size                = 64M
+#open-files-limit      = 2000
+table_open_cache       = 400
+myisam_sort_buffer_size        = 64M
+concurrent_insert      = 2
+read_buffer_size       = 2M
+read_rnd_buffer_size   = 1M
+#
+# * Query Cache Configuration
+#
+# Cache only tiny result sets, so we can fit more in the query cache.
+query_cache_limit              = 128K
+query_cache_size               = 16M
+# for more write intensive setups, set to DEMAND or OFF
+#query_cache_type              = DEMAND
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/lib/mysql/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# we do want to know about network errors and such
+log_warnings           = 2
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log[={0|1}]
+slow_query_log_file    = /var/lib/mysql/mariadb-slow.log
+long_query_time = 10
+#log_slow_rate_limit   = 1000
+log_slow_verbosity     = query_plan
+
+#log-queries-not-using-indexes
+#log_slow_admin_statements
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id             = 1
+#report_host           = master1
+#auto_increment_increment = 2
+#auto_increment_offset = 1
+log_bin                        = /var/lib/mysql/mariadb-bin
+log_bin_index          = /var/lib/mysql/mariadb-bin.index
+# not fab for performance, but safer
+#sync_binlog           = 1
+expire_logs_days       = 10
+max_binlog_size         = 100M
+# slaves
+#relay_log             = /var/lib/mysql/relay-bin
+#relay_log_index       = /var/lib/mysql/relay-bin.index
+#relay_log_info_file   = /var/lib/mysql/relay-bin.info
+#log_slave_updates
+#read_only
+#
+# If applications support it, this stricter sql_mode prevents some
+# mistakes like inserting invalid dates etc.
+#sql_mode              = NO_ENGINE_SUBSTITUTION,TRADITIONAL
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+default_storage_engine = InnoDB
+# you can't just change log file size, requires special procedure
+#innodb_log_file_size  = 50M
+innodb_buffer_pool_size        = 64M
+innodb_log_buffer_size = 8M
+innodb_file_per_table  = 1
+innodb_open_files      = 400
+innodb_io_capacity     = 400
+innodb_flush_method    = O_DIRECT
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+#
+# * Galera-related settings
+#
+
+[galera]
+# Mandatory settings
+
+# use InnoDB instead of XtraDB
+ignore_builtin_innodb
+innodb_autoinc_lock_mode=2
+innodb_doublewrite=1
+
+plugin_load=innodb=ha_innodb.so
+plugin_dir=/usr/lib/plugin
+
+wsrep_provider=/usr/lib/libgalera_smm.so
+binlog_format=row
+default_storage_engine=InnoDB
+
+query_cache_size=0 # mandatory only for versions prior to 5.5.40-galera, 10.0.14-galera and 10.1.2
+wsrep_on=ON        # Enable wsrep replication
+#wsrep_cluster_name=
+#wsrep_cluster_address=
+wsrep_sst_method=rsync
+
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet     = 16M
+
+[mysql]
+#no-auto-rehash        # faster start of mysql but no tab completition
+
+[isamchk]
+key_buffer             = 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/

package/mysql/mysql.hash +2 -0

index 84f3361..d9f3574 100644
@@ -1,2 +1,4 @@
 # From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5
 md5    887f869bcc757957067b9198f707f32f        mysql-5.1.73.tar.gz
+# From: https://downloads.mariadb.org/interstitial/mariadb-galera-10.0.17/source/mariadb-galera-10.0.17.tar.gz
+sha1    91b70d19fb687a58f0e40f50608071489743e54e       mariadb-galera-10.0.17.tar.gz

package/mysql/mysql.mk +185 -32

index 8718193..9abf50e 100644
@@ -4,17 +4,24 @@
 #
 ################################################################################
 
-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_LICENSE = GPLv2
-MYSQL_LICENSE_FILES = README COPYING
-
-MYSQL_CONF_ENV = \
+################################################################################
+#
+# mysql implementation
+#
+################################################################################
+
+
+MYSQL_MYSQL_VERSION_MAJOR = 5.1
+MYSQL_MYSQL_VERSION = $(MYSQL_MYSQL_VERSION_MAJOR).73
+MYSQL_MYSQL_SOURCE = mysql-$(MYSQL_MYSQL_VERSION).tar.gz
+MYSQL_MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_MYSQL_VERSION_MAJOR)
+MYSQL_MYSQL_INSTALL_STAGING = YES
+MYSQL_MYSQL_DEPENDENCIES = readline ncurses
+MYSQL_MYSQL_AUTORECONF = YES
+MYSQL_MYSQL_LICENSE = GPLv2
+MYSQL_MYSQL_LICENSE_FILES = README COPYING
+
+MYSQL_MYSQL_CONF_ENV = \
        ac_cv_sys_restartable_syscalls=yes \
        ac_cv_path_PS=/bin/ps \
        ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \

@@ -23,7 +30,7 @@ MYSQL_CONF_ENV = \
        ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \
        mysql_cv_new_rl_interface=yes
 
-MYSQL_CONF_OPTS = \
+MYSQL_MYSQL_CONF_OPTS = \
        --without-ndb-binlog \
        --without-docs \
        --without-man \

@@ -34,22 +41,22 @@ MYSQL_CONF_OPTS = \
        --disable-mysql-maintainer-mode
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MYSQL_DEPENDENCIES += openssl
+MYSQL_MYSQL_DEPENDENCIES += openssl
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-MYSQL_DEPENDENCIES += zlib
+MYSQL_MYSQL_DEPENDENCIES += zlib
 endif
 
 ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y)
-MYSQL_DEPENDENCIES += host-mysql host-bison
-HOST_MYSQL_DEPENDENCIES = host-zlib host-ncurses
+MYSQL_MYSQL_DEPENDENCIES += host-mysql host-bison
+HOST_MYSQL_MYSQL_DEPENDENCIES = host-zlib host-ncurses
 
-HOST_MYSQL_CONF_OPTS = \
+HOST_MYSQL_MYSQL_CONF_OPTS = \
        --with-embedded-server \
        --disable-mysql-maintainer-mode
 
-MYSQL_CONF_OPTS += \
+MYSQL_MYSQL_CONF_OPTS += \
        --localstatedir=/var/mysql \
        --with-atomic-ops=up \
        --with-embedded-server \

@@ -69,12 +76,12 @@ MYSQL_CONF_OPTS += \
 # Debugging is only available for the server, so no need for
 # this if-block outside of the server if-block
 ifeq ($(BR2_ENABLE_DEBUG),y)
-MYSQL_CONF_OPTS += --with-debug=full
+MYSQL_MYSQL_CONF_OPTS += --with-debug=full
 else
-MYSQL_CONF_OPTS += --without-debug
+MYSQL_MYSQL_CONF_OPTS += --without-debug
 endif
 
-define HOST_MYSQL_BUILD_CMDS
+define HOST_MYSQL_MYSQL_BUILD_CMDS
        $(MAKE) -C $(@D)/include my_config.h
        $(MAKE) -C $(@D)/mysys libmysys.a
        $(MAKE) -C $(@D)/strings libmystrings.a

@@ -84,41 +91,188 @@ define HOST_MYSQL_BUILD_CMDS
        $(MAKE) -C $(@D)/sql gen_lex_hash
 endef
 
-define HOST_MYSQL_INSTALL_CMDS
+define HOST_MYSQL_MYSQL_INSTALL_CMDS
        $(INSTALL) -m 0755  $(@D)/sql/gen_lex_hash  $(HOST_DIR)/usr/bin/
 endef
 
-define MYSQL_USERS
+define MYSQL_MYSQL_USERS
        mysql -1 nogroup -1 * /var/mysql - - MySQL daemon
 endef
 
-define MYSQL_ADD_FOLDER
+define MYSQL_MYSQL_ADD_FOLDER
        $(INSTALL) -d $(TARGET_DIR)/var/mysql
 endef
 
-MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_FOLDER
+MYSQL_MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_FOLDER
 
-define MYSQL_INSTALL_INIT_SYSV
+define MYSQL_MYSQL_INSTALL_INIT_SYSV
        $(INSTALL) -D -m 0755 package/mysql/S97mysqld \
                $(TARGET_DIR)/etc/init.d/S97mysqld
 endef
 
 else
-MYSQL_CONF_OPTS += \
+MYSQL_MYSQL_CONF_OPTS += \
        --without-server
 endif
 
 
-define MYSQL_REMOVE_TEST_PROGS
+define MYSQL_MYSQL_REMOVE_TEST_PROGS
        rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef
 
-define MYSQL_ADD_MYSQL_LIB_PATH
+define MYSQL_MYSQL_ADD_MYSQL_LIB_PATH
        echo "/usr/lib/mysql" >> $(TARGET_DIR)/etc/ld.so.conf
 endef
 
-MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS
-MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_MYSQL_LIB_PATH
+MYSQL_MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_MYSQL_REMOVE_TEST_PROGS
+MYSQL_MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_MYSQL_ADD_MYSQL_LIB_PATH
+
+################################################################################
+#
+# mariadb galera cluster implementation
+#
+################################################################################
+
+# According to MariaDB galera cluster documentation these options must be passed
+# to CMake:
+MYSQL_MARIADB_GALERA_CLUSTER_OPTS += "-DWITH_WSREP=1"
+MYSQL_MARIADB_GALERA_CLUSTER_OPTS += "-DWITH_INNODB_DISALLOW_WRITES=1"
+
+# msgpack causes trouble when cross-compiling:
+MYSQL_MARIADB_GALERA_EXTRA_OPTS += "-DGRN_WITH_MESSAGE_PACK=no"
+
+# Mroonga needs libstemmer. Some work still needs to be done before it can be
+# included in buildroot. Disable it for now.
+MYSQL_MARIADB_GALERA_EXTRA_OPTS += "-DWITHOUT_MROONGA=1"
+
+# This value is determined automatically during straight compile by compiling
+# and running a test code. You cannot do that during cross-compile. However the
+# stack grows downward in most if not all modern systems. The only exception I
+# am aware of is PA-RISC which is not supported by buildroot. Therefore it makes
+# sense to hardcode the value. If an arch is added the stack of which grows up
+# one should expect unpredictable behavior at run time.
+MYSQL_MARIADB_GALERA_EXTRA_OPTS += "-DSTACK_DIRECTION=-1"
+
+# XTRADB requires atomics intrinsic. MariaDB package tests for them by compiling
+# and running C code which is not possible when cross-compiling. It is probably
+# probably possible to use BR2_ARCH_HAS_ATOMIC_INTRINSICS instead of compiling
+# and running some test code but for now we will just disable XTRADB.
+MYSQL_MARIADB_GALERA_EXTRA_OPTS += "-DWITHOUT_XTRADB=1"
+
+# 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_MARIADB_GALERA_EXTRA_OPTS += "-DWITH_JEMALLOC=no -DWITHOUT_TOKUDB=1"
+
+MYSQL_MARIADB_GALERA_VERSION = 10.0.17
+MYSQL_MARIADB_GALERA_SOURCE = mariadb-galera-$(MYSQL_MARIADB_GALERA_VERSION).tar.gz
+MYSQL_MARIADB_GALERA_SITE = https://downloads.mariadb.org/interstitial/mariadb-galera-$(MYSQL_MARIADB_GALERA_VERSION)/source/
+
+# In order to cross-compile mariadb galera cluster one should first natively
+# build in order to use some of the generated executables. They are then
+# included by import_executables.cmake which is generated during the native
+# build. Therefore host-mariadb-galera needs to be added to mariadb galera
+# dependencies and
+# -DIMPORT_EXECUTABLES=$(BUILD_DIR)/host-mariadb-galera/import_executables.cmake
+# must be passed to cmake
+MYSQL_MARIADB_GALERA_TARGET_BUILD_IMPORT += "-DIMPORT_EXECUTABLES=$(HOST_MYSQL_DIR)/import_executables.cmake"
+
+
+MYSQL_MARIADB_GALERA_INSTALL_STAGING = NO
+MYSQL_MARIADB_GALERA_INSTALL_TARGET = YES
+
+MYSQL_MARIADB_GALERA_DEPENDENCIES = \
+       host-mysql \
+       ncurses \
+       openssl \
+       zlib \
+       libaio \
+       libtool \
+       galera
+
+MYSQL_MARIADB_GALERA_CONF_OPTS = $(MYSQL_MARIADB_GALERA_EXTRA_OPTS)
+MYSQL_MARIADB_GALERA_CONF_OPTS += $(MYSQL_MARIADB_GALERA_TARGET_BUILD_IMPORT)
+HOST_MYSQL_MARIADB_GALERA_CONF_OPTS = $(MYSQL_MARIADB_GALERA_EXTRA_OPTS)
+
+# Options specific to Galera cluster
+MYSQL_MARIADB_GALERA_CONF_OPTS += $(MYSQL_MARIADB_GALERA_CLUSTER_OPTS)
+HOST_MYSQL_MARIADB_GALERA_CONF_OPTS += $(MYSQL_MARIADB_GALERA_CLUSTER_OPTS)
+
+# Post install configuration
+
+define MYSQL_MARIADB_GALERA_USERS
+       mysql 1000 mysql 1000 * /var/lib/mysql - - MySQL Server
+endef
+
+define MYSQL_MARIADB_GALERA_INSTALL_CNF
+       mkdir -p $(TARGET_DIR)/etc/mysql/conf.d
+       install -m 644 package/mysql/mariadb-galera-cluster.cnf $(TARGET_DIR)/etc/mysql/my.cnf
+endef
+
+MYSQL_MARIADB_GALERA_POST_INSTALL_TARGET_HOOKS += MYSQL_MARIADB_GALERA_INSTALL_CNF
 
+define MYSQL_MARIADB_GALERA_INSTALL_INIT_SYSV
+       $(INSTALL) -D -m 0755 $(@D)/support-files/mysql.server.sh \
+               $(TARGET_DIR)/etc/init.d/mysqld
+endef
+
+# generic options
+
+MYSQL_MARIADB_GALERA_AUTORECONF = NO
+MYSQL_MARIADB_GALERA_LICENSE = GPLv2
+MYSQL_MARIADB_GALERA_LICENSE_FILES = README COPYING COPYING.LESSER
+
+################################################################################
+#
+# meta package
+#
+################################################################################
+
+
+ifeq ($(MYSQL_MYSQL),y)
+       MYSQL_VERSION = $(MYSQL_MYSQL_VERSION)
+       MYSQL_SOURCE = $(MYSQL_MYSQL_SOURCE)
+       MYSQL_SITE = $(MYSQL_MYSQL_SITE)
+       MYSQL_INSTALL_STAGING = $(MYSQL_MYSQL_INSTALL_STAGING)
+       MYSQL_DEPENDENCIES = $(MYSQL_MYSQL_DEPENDENCIES)
+       MYSQL_AUTORECONF = $(MYSQL_MYSQL_AUTORECONF)
+       MYSQL_LICENSE = $(MYSQL_MYSQL_LICENSE)
+       MYSQL_LICENSE_FILES = $(MYSQL_MYSQL_LICENSE_FILES)
+       MYSQL_CONF_ENV = $(MYSQL_MYSQL_CONF_ENV)
+       MYSQL_CONF_OPTS = $(MYSQL_MYSQL_CONF_OPTS)
+
+       MYSQL_USERS = $(MYSQL_MYSQL_USERS)
+       MYSQL_POST_INSTALL_TARGET_HOOKS += $(MYSQL_MYSQL_POST_INSTALL_TARGET_HOOKS)
+
+       MYSQL_INSTALL_INIT_SYSV = $(MYSQL_MYSQL_INSTALL_INIT_SYSV)
+
+       HOST_MYSQL_DEPENDENCIES = $(HOST_MYSQL_MYSQL_DEPENDENCIES)
+       HOST_MYSQL_CONF_OPTS = $(HOST_MYSQL_MYSQL_CONF_OPTS)
+       HOST_MYSQL_BUILD_CMDS = $(HOST_MYSQL_MYSQL_BUILD_CMDS)
+       HOST_MYSQL_INSTALL_CMDS = $(HOST_MYSQL_MYSQL_INSTALL_CMDS)
+else ifeq ($(MYSQL_MARIADB_GALERA),y)
+       MYSQL_VERSION = $(MYSQL_MARIADB_GALERA_VERSION)
+       MYSQL_SOURCE = $(MYSQL_MARIADB_GALERA_SOURCE)
+       MYSQL_SITE = $(MYSQL_MARIADB_GALERA_SITE)
+       MYSQL_INSTALL_STAGING = $(MYSQL_MARIADB_GALERA_INSTALL_STAGING)
+       MYSQL_DEPENDENCIES = $(MYSQL_MARIADB_GALERA_DEPENDENCIES)
+       MYSQL_AUTORECONF = $(MYSQL_MARIADB_GALERA_AUTORECONF)
+       MYSQL_LICENSE = $(MYSQL_MARIADB_GALERA_LICENSE)
+       MYSQL_LICENSE_FILES = $(MYSQL_MARIADB_GALERA_LICENSE_FILES)
+       MYSQL_CONF_OPTS = $(MYSQL_MARIADB_GALERA_CONF_OPTS)
+
+       MYSQL_USERS = $(MYSQL_MARIADB_GALERA_USERS)
+       MYSQL_POST_INSTALL_TARGET_HOOKS += $(MYSQL_MARIADB_GALERA_POST_INSTALL_TARGET_HOOKS)
+
+       MYSQL_INSTALL_INIT_SYSV = $(MYSQL_MARIADB_GALERA_INSTALL_INIT_SYSV)
+
+       HOST_MYSQL_DEPENDENCIES = $(HOST_MYSQL_MARIADB_GALERA_DEPENDENCIES)
+       HOST_MYSQL_CONF_OPTS = $(HOST_MYSQL_MARIADB_GALERA_CONF_OPTS)
+endif
+
+ifeq ($(MYSQL_MYSQL),y)
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
+else ifeq ($(MYSQL_MARIADB_GALERA),y)
+$(eval $(host-cmake-package))
+$(eval $(cmake-package))
+endif
--

1.9.1

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

Here is a partial review (inlined).

But, overall, I feel like this implementation (essentially the *.mk file) does not match the Buildroot way of doing things... :-/ Have you look at the virtual package infrastructure [1]?

Dear Samuel Martin,

Quoted 5 lines · Samuel Martin

Here is a partial review (inlined).

But, overall, I feel like this implementation (essentially the *.mk file) does not match the Buildroot way of doing things... :-/ Have you look at the virtual package infrastructure [1]?

Fully agreed. Using the same package for both MySQL and MariaDB would make sense if their build system was similar. But it's completely different, so it really needs to be two separate packages.

Then, if their client libraries are compatible, so that client applications can use either MySQL or MariaDB with no change, then doing a virtual package is indeed the right direction.

Best regards,

Thomas

OK I can make a virtual package, that seems to make sense. However, according to section 17.11.6, it seems that I'll have to patch all packages that depend on mysql, because there is some special magic to add in the depender's Config.in, am I right? Is this the way to go?

Quoted 4 lines

OK I can make a virtual package, that seems to make sense. However, according to section 17.11.6, it seems that I'll have to patch all packages that depend on mysql, because there is some special magic to add in the depender's Config.in, am I right? Is this the way to go?

We could do something like jpeg (virtual), libjpeg and jpeg-turbo. This way, dependers can continue to do a "select BR2_PACKAGE_MYSQL", and there is a "choice" in mysql/Config.in to choose between the original MySQL or MariaDB. Of course the original MySQL package will have to be renamed to some other name than mysql.

I think the mechanism where the package depending on the virtual package do "depends on BR2_PACKAGE_HAS_<foo>" is very good for cases like OpenGL and al. where we have potentially an arbitrary/unlimited number of providers.

But for things like libjpeg/jpeg-turbo or mysql/mariadb, where we know the choice will be limited to a few alternatives, it probably makes sense to have something like libjpeg.

I've Cc'ed Yann, to get his opinion on the matter.

Well, I never much liked the way the jpeg package has been done.

I do understand that it makes it just work great for users. However, that was not the way virtual packages were supposed to work; it's just a (bad) hack (which in fact predates the actual virtual package infra, IIRC).

And it's a hack that prevents a br2-external from providing its own jpeg implementation (e.g. one optimised to make use of a specific SoC hardware, for example).

Now, the mariadb vs. mysql case might not be so problematic. We don't much expect a myriad of alternate implementations to just pop-up over the night, and even less hardware-specific implementations. But who knows? That's probably what we originally thought about the jpeg case, and now I see at least one reason why we should not have done it that way... Maybe some vendors have specially-crafted mysql /forks/ tailored to specific use-cases (but do we care?)...

So, I'd rather that we just handle virtual packages like is done for the GL case rather than the jpeg case (which I consider broken...)

Quoted 11 lines

Well, I never much liked the way the jpeg package has been done.

I do understand that it makes it just work great for users. However, that was not the way virtual packages were supposed to work; it's just a (bad) hack (which in fact predates the actual virtual package infra, IIRC).

And it's a hack that prevents a br2-external from providing its own jpeg implementation (e.g. one optimised to make use of a specific SoC hardware, for example).

Quoted 7 lines

Now, the mariadb vs. mysql case might not be so problematic. We don't much expect a myriad of alternate implementations to just pop-up over the night, and even less hardware-specific implementations. But who knows? That's probably what we originally thought about the jpeg case, and now I see at least one reason why we should not have done it that way... Maybe some vendors have specially-crafted mysql /forks/ tailored to specific use-cases (but do we care?)...

Well, if you take this as an argument, then *all* packages should be virtual packages.

I know a customer that has custom versions of dbus
and directfb, for example. Should they be virtual packages because of that?

Quoted 2 lines

So, I'd rather that we just handle virtual packages like is done for the GL case rather than the jpeg case (which I consider broken...)

Well, for MySQL, I'm still not sure. The main drawback of going all the way to the standard virtual package mechanism is that you can no longer "select" MySQL from any other package. You can only use a "depends on" dependency.

Now, the mariadb vs. mysql case might not be so problematic. We don't much expect a myriad of alternate implementations to just pop-up over the night,

and even less hardware-specific implementations. But who knows? That's probably what we originally thought about the jpeg case, and now I see at least one reason why we should not have done it that way... Maybe some vendors have specially-crafted mysql /forks/ tailored to specific use-cases (but do we care?)...

Quoted 3 lines · Yann E. MORIN

Quoted 3 lines

Now, the mariadb vs. mysql case might not be so problematic. We don't much expect a myriad of alternate implementations to just pop-up over the night,

Well, actually... IIUC there are in fact two MariaDB
implementations: the cluster verion (Galera, added here) and the single-node version. Well, they might actually be the same, but the download URLs are different.

Sylvain, can you comment?

Dear Sylvain Raybaud,

Quoted 5 lines · Sylvain Raybaud

Quoted 5 lines

OK I can make a virtual package, that seems to make sense. However, according to section 17.11.6, it seems that I'll have to patch all packages that depend on mysql, because there is some special magic to add in the depender's Config.in, am I right? Is this the way to go?

We could do something like jpeg (virtual), libjpeg and jpeg-turbo. This way, dependers can continue to do a "select BR2_PACKAGE_MYSQL", and there is a "choice" in mysql/Config.in to choose between the original MySQL or MariaDB.

renamed to some other name than mysql.

Of course the original MySQL package will have to be

Quoted 1 line

renamed to some other name than mysql.

Does "original_mysql" sound good to you?

Hi Sylvain,

Here is a partial review (inlined).

But, overall, I feel like this implementation (essentially the *.mk file) does not match the Buildroot way of doing things... :-/ Have you look at the virtual package infrastructure [1]?

On Thu, Jul 9, 2015 at 6:22 PM, Sylvain Raybaud

Quoted 5 lines

diff --git a/package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch b/package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch

Quoted 4 lines

index 0000000..83eac77 --- /dev/null +++ b/package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch

Quoted 2 lines

+Do not perform test if the build is not requested anyway. The test may fail, +preventing building the whole package. +

The comment does not really reflect what is done in the patch: - according to the comment: this change touch tests; - AFAICS, this change disable a plugin.

[..]

Quoted 1 line

++IF(NOT WITHOUT_XTRADB)

Does this boolean come from an option? it could.

Quoted 5 lines

diff --git a/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch b/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

Quoted 4 lines

index 0000000..1ddec5d --- /dev/null +++ b/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

Quoted 5 lines

+Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS in order to be +cross-compile friendly. +In buildroot another solution (maybe better, maybe not) could be to use +BR2_ARCH_HAS_ATOMICS in order to determine the value of HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE +and likes. +

Missing SoB line [2].

It makes sense to submit this patch upstream as well.

[..]

Quoted 10 lines

+config MYSQL_MARIADB_GALERA + bool "mariadb-galera" +
select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL +
select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBAIO +
select BR2_PACKAGE_LIBTOOL + select BR2_PACKAGE_GALERA +
select BR2_PACKAGE_BASH # runtime dependency only + select
BR2_PACKAGE_LSOF # runtime dependency only + select
BR2_PACKAGE_PROCPS_NG # runtime dependency only + select
BR2_PACKAGE_FINDUTILS # runtime dependency only + select
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on
BR2_TOOLCHAIN_BUILDROOT_GLIBC || BR2_PACKAGE_EGLIBC # spawn()

Missing "depends on" for the selected packages [3].

Quoted 5 lines

+ help + MariaDB Galera Cluster. +
https://mariadb.com/kb/en/mariadb/what-is-mariadb-galera-cluster
+ +endchoice + +endif + +comment "MySQL needs a toolchain w/ C++, threads" +depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

Indent is wrong. Missing: depends on BR2_USE_MMU Move this comment in the choice.

Quoted 3 lines

+ +comment "MariaDB needs an (e)glibc toolchain" +depends on !BR2_TOOLCHAIN_BUILDROOT_GLIBC && !BR2_PACKAGE_EGLIBC # spawn()

Indent is wrong. Move this comment in the choice.

Hi Sylvain,

Here is a partial review (inlined).

But, overall, I feel like this implementation (essentially the *.mk file) does not match the Buildroot way of doing things... :-/ Have you look at the virtual package infrastructure [1]?

On Thu, Jul 9, 2015 at 6:22 PM, Sylvain Raybaud

Quoted 4 lines

(quoted diff) +0 -0

a/package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch

Quoted 2 lines

Quoted 4 lines

index 0000000..83eac77 --- /dev/null +++ b/package/mysql/10.0.17/mariadb-galera-01-fix_xtradb_cmakelist.patch

Quoted 1 line

Quoted 2 lines

+Do not perform test if the build is not requested anyway. The test may fail, +preventing building the whole package. +

The comment does not really reflect what is done in the patch: - according to the comment: this change touch tests; - AFAICS, this change disable a plugin.

[..]

Quoted 1 line

++IF(NOT WITHOUT_XTRADB)

Does this boolean come from an option? it could.

Quoted 4 lines

(quoted diff) +0 -0

a/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

Quoted 2 lines

Quoted 4 lines

index 0000000..1ddec5d --- /dev/null +++ b/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

Quoted 1 line

Quoted 5 lines

+Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS in order to be +cross-compile friendly. +In buildroot another solution (maybe better, maybe not) could be to use +BR2_ARCH_HAS_ATOMICS in order to determine the value of HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE +and likes. +

Missing SoB line [2].

It makes sense to submit this patch upstream as well.

[..]

Quoted 10 lines

+config MYSQL_MARIADB_GALERA + bool "mariadb-galera" +
select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL +
select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBAIO +
select BR2_PACKAGE_LIBTOOL + select BR2_PACKAGE_GALERA +
select BR2_PACKAGE_BASH # runtime dependency only + select
BR2_PACKAGE_LSOF # runtime dependency only + select
BR2_PACKAGE_PROCPS_NG # runtime dependency only + select
BR2_PACKAGE_FINDUTILS # runtime dependency only + select
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on
BR2_TOOLCHAIN_BUILDROOT_GLIBC || BR2_PACKAGE_EGLIBC # spawn()

Missing "depends on" for the selected packages [3].

Quoted 5 lines

+ help + MariaDB Galera Cluster. +
https://mariadb.com/kb/en/mariadb/what-is-mariadb-galera-cluster
+ +endchoice + +endif + +comment "MySQL needs a toolchain w/ C++, threads" +depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

Indent is wrong. Missing: depends on BR2_USE_MMU Move this comment in the choice.

Quoted 3 lines

+ +comment "MariaDB needs an (e)glibc toolchain" +depends on !BR2_TOOLCHAIN_BUILDROOT_GLIBC && !BR2_PACKAGE_EGLIBC # spawn()

Indent is wrong. Move this comment in the choice.

Quoted 9 lines

Quoted 9 lines

+--- a/storage/xtradb/CMakeLists.txt 2014-10-30
16:24:33.160188627 +0100 ++++ b/storage/xtradb/CMakeLists.txt

2014-10-30 16:25:09.060188829 +0100 +@@ -470,12 +470,13 @@ +
SET(WITH_INNOBASE_STORAGE_ENGINE TRUE) + ENDIF() + 
+-IF(XTRADB_OK) +-  MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES}
STORAGE_ENGINE +-    DEFAULT +-    RECOMPILE_FOR_EMBEDDED +-

LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT}) +-ELSE() +- MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform") ++IF(NOT WITHOUT_XTRADB)

Does this boolean come from an option? it could.

Quoted 11 lines

Quoted 11 lines

++ IF(XTRADB_OK) ++ MYSQL_ADD_PLUGIN(xtradb
${INNOBASE_SOURCES} STORAGE_ENGINE ++ DEFAULT ++
RECOMPILE_FOR_EMBEDDED ++ LINK_LIBRARIES ${ZLIB_LIBRARY}
${LINKER_SCRIPT}) ++ ELSE() ++ MESSAGE(FATAL_ERROR "Percona
XtraDB is not supported on this platform") ++ ENDIF() + ENDIF() +- diff --git a/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch b/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

new file mode 100644

Quoted 4 lines

Quoted 4 lines

index 0000000..1ddec5d --- /dev/null +++ b/package/mysql/10.0.17/mariadb-galera-02-fix_innodb_cmakelist.patch

(quoted diff) +0 -0

@@ -0,0 +1,251 @@

Quoted 5 lines

Quoted 5 lines

+Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS in order to be +cross-compile friendly. +In buildroot another solution (maybe better, maybe not) could be to use +BR2_ARCH_HAS_ATOMICS in order to determine the value of HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE +and likes. +

Missing SoB line [2].

It makes sense to submit this patch upstream as well.