diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/mysql/mariadb | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb')
5 files changed, 245 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch b/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch new file mode 100644 index 000000000..8d9f558d0 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Avoid CMAKE_MODULE_PATH being overwritten | ||
2 | |||
3 | OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless | ||
4 | we set it after setting the project name. | ||
5 | |||
6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
7 | |||
8 | Upstream-Status: Inappropriate [working around OE-Core bug] | ||
9 | |||
10 | --- mariadb/CMakeLists.txt 2014-07-17 11:01:07.676353047 +0100 | ||
11 | +++ mariadb/CMakeLists.txt 2014-07-17 11:01:31.299353107 +0100 | ||
12 | @@ -28,8 +28,6 @@ | ||
13 | |||
14 | MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") | ||
15 | |||
16 | -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) | ||
17 | - | ||
18 | # Distinguish between community and non-community builds, with the | ||
19 | # default being a community build. This does not impact the feature | ||
20 | # set that will be compiled in; it's merely provided as a hint to | ||
21 | @@ -77,6 +75,8 @@ | ||
22 | ENDIF() | ||
23 | PROJECT(${MYSQL_PROJECT_NAME}) | ||
24 | |||
25 | +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) | ||
26 | + | ||
27 | IF(BUILD_CONFIG) | ||
28 | INCLUDE( | ||
29 | ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake) | ||
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch b/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch new file mode 100644 index 000000000..7516619eb --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch | |||
@@ -0,0 +1,161 @@ | |||
1 | From 6db2a606196fb38a6d106dc409eee1cb9a40a440 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tor Didriksen <tor.didriksen@oracle.com> | ||
3 | Date: Mon, 24 Jun 2013 17:15:35 +0200 | ||
4 | Subject: [PATCH] Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18 | ||
5 | |||
6 | With this patch, the libmysql/ directory contains: | ||
7 | libmysqlclient.a | ||
8 | libmysqlclient_r.a -> libmysqlclient.a | ||
9 | libmysqlclient_r.so -> libmysqlclient.so* | ||
10 | libmysqlclient_r.so.18 -> libmysqlclient.so.18* | ||
11 | libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0* | ||
12 | libmysqlclient.so -> libmysqlclient.so.18* | ||
13 | libmysqlclient.so.18 -> libmysqlclient.so.18.1.0* | ||
14 | libmysqlclient.so.18.1.0* | ||
15 | |||
16 | This fixes libmysqlclient_r symlinks pointing to the unversioned | ||
17 | libmysqlclient.so symlink (leading to package QA errors since the | ||
18 | libmysqlclient-r package ends up depending on libmysqlclient-dev). | ||
19 | |||
20 | Borrowed from MySQL 5.6 tree at https://github.com/percona/mysql/ | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
25 | |||
26 | --- | ||
27 | cmake/install_macros.cmake | 25 +++++++++++++++---------- | ||
28 | cmake/mysql_version.cmake | 3 ++- | ||
29 | libmysql/CMakeLists.txt | 36 ++++++++++++++++++++++++++++-------- | ||
30 | 3 files changed, 45 insertions(+), 19 deletions(-) | ||
31 | |||
32 | diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake | ||
33 | index b8efdf8..a0d0e68 100644 | ||
34 | --- a/cmake/install_macros.cmake | ||
35 | +++ b/cmake/install_macros.cmake | ||
36 | @@ -1,4 +1,4 @@ | ||
37 | -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. | ||
38 | +# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. | ||
39 | # | ||
40 | # This program is free software; you can redistribute it and/or modify | ||
41 | # it under the terms of the GNU General Public License as published by | ||
42 | @@ -111,28 +111,33 @@ FUNCTION(INSTALL_SCRIPT) | ||
43 | ENDFUNCTION() | ||
44 | |||
45 | # Install symbolic link to CMake target. | ||
46 | -# the link is created in the same directory as target | ||
47 | -# and extension will be the same as for target file. | ||
48 | -MACRO(INSTALL_SYMLINK linkname target destination component) | ||
49 | +# We do 'cd path; ln -s target_name link_name' | ||
50 | +# We also add an INSTALL target for "${path}/${link_name}" | ||
51 | +MACRO(INSTALL_SYMLINK target target_name link_name destination component) | ||
52 | IF(UNIX) | ||
53 | GET_TARGET_PROPERTY(location ${target} LOCATION) | ||
54 | GET_FILENAME_COMPONENT(path ${location} PATH) | ||
55 | - GET_FILENAME_COMPONENT(name ${location} NAME) | ||
56 | - SET(output ${path}/${linkname}) | ||
57 | + MESSAGE(STATUS "target ${target}") | ||
58 | + MESSAGE(STATUS "link_name ${link_name}") | ||
59 | + MESSAGE(STATUS "target_name ${target_name}") | ||
60 | + MESSAGE(STATUS "path ${path}") | ||
61 | + MESSAGE(STATUS "") | ||
62 | + | ||
63 | + SET(output ${path}/${link_name}) | ||
64 | ADD_CUSTOM_COMMAND( | ||
65 | OUTPUT ${output} | ||
66 | COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output} | ||
67 | COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink | ||
68 | - ${name} | ||
69 | - ${linkname} | ||
70 | + ${target_name} | ||
71 | + ${link_name} | ||
72 | WORKING_DIRECTORY ${path} | ||
73 | DEPENDS ${target} | ||
74 | ) | ||
75 | |||
76 | - ADD_CUSTOM_TARGET(symlink_${linkname} | ||
77 | + ADD_CUSTOM_TARGET(symlink_${link_name} | ||
78 | ALL | ||
79 | DEPENDS ${output}) | ||
80 | - SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
81 | + SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
82 | IF(CMAKE_GENERATOR MATCHES "Xcode") | ||
83 | # For Xcode, replace project config with install config | ||
84 | STRING(REPLACE "${CMAKE_CFG_INTDIR}" | ||
85 | diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt | ||
86 | index be5760f..96286ff 100644 | ||
87 | --- a/libmysql/CMakeLists.txt | ||
88 | +++ b/libmysql/CMakeLists.txt | ||
89 | @@ -180,6 +180,12 @@ IF(MSVC) | ||
90 | INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) | ||
91 | ENDIF() | ||
92 | |||
93 | +MACRO(GET_TARGET_NAME target out_name) | ||
94 | + GET_TARGET_PROPERTY(location ${target} LOCATION) | ||
95 | + GET_FILENAME_COMPONENT(name ${location} NAME) | ||
96 | + SET(${out_name} ${name}) | ||
97 | +ENDMACRO() | ||
98 | + | ||
99 | IF(UNIX) | ||
100 | MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) | ||
101 | SET(DOT_VERSION ".${VERSION}") | ||
102 | @@ -192,7 +198,13 @@ IF(UNIX) | ||
103 | SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) | ||
104 | ENDIF() | ||
105 | ENDMACRO() | ||
106 | - INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) | ||
107 | +ENDIF() | ||
108 | + | ||
109 | +IF(UNIX) | ||
110 | + GET_TARGET_NAME(mysqlclient lib_name) | ||
111 | + INSTALL_SYMLINK(mysqlclient | ||
112 | + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a | ||
113 | + ${INSTALL_LIBDIR} Development) | ||
114 | ENDIF() | ||
115 | |||
116 | IF(NOT DISABLE_SHARED) | ||
117 | @@ -205,10 +217,9 @@ IF(NOT DISABLE_SHARED) | ||
118 | # libtool compatability | ||
119 | IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) | ||
120 | SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") | ||
121 | - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") | ||
122 | - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") | ||
123 | ELSE() | ||
124 | - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0") | ||
125 | + SET(OS_SHARED_LIB_VERSION | ||
126 | + "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") | ||
127 | ENDIF() | ||
128 | # Name of shared library is mysqlclient on Unix | ||
129 | SET_TARGET_PROPERTIES(libmysql PROPERTIES | ||
130 | @@ -239,8 +250,13 @@ IF(NOT DISABLE_SHARED) | ||
131 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
132 | "" | ||
133 | linkname) | ||
134 | - INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) | ||
135 | - SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") | ||
136 | + GET_TARGET_NAME(libmysql lib_name) | ||
137 | + GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE) | ||
138 | + INSTALL_SYMLINK(libmysql | ||
139 | + ${lib_name} ${linkname} | ||
140 | + ${INSTALL_LIBDIR} SharedLibraries) | ||
141 | + SET(OS_SHARED_LIB_SYMLINKS | ||
142 | + "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") | ||
143 | LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) | ||
144 | FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) | ||
145 | GET_VERSIONED_LIBNAME( | ||
146 | @@ -248,7 +264,11 @@ IF(NOT DISABLE_SHARED) | ||
147 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
148 | "${ver}" | ||
149 | linkname) | ||
150 | - INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) | ||
151 | + GET_VERSIONED_LIBNAME( | ||
152 | + ${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver) | ||
153 | + INSTALL_SYMLINK(libmysql | ||
154 | + ${lib_name_ver} ${linkname} | ||
155 | + ${INSTALL_LIBDIR} SharedLibraries) | ||
156 | ENDFOREACH() | ||
157 | ENDIF() | ||
158 | ENDIF() | ||
159 | -- | ||
160 | 2.0.3 | ||
161 | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf new file mode 100644 index 000000000..f2c9b9036 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf | |||
@@ -0,0 +1,22 @@ | |||
1 | [client] | ||
2 | #password = password | ||
3 | port = 3306 | ||
4 | socket = /tmp/mysql.sock | ||
5 | |||
6 | [mysqld_safe] | ||
7 | err-log = /var/log/mysql.err | ||
8 | |||
9 | [mysqld] | ||
10 | user = mysql | ||
11 | port = 3306 | ||
12 | socket = /tmp/mysql.sock | ||
13 | pid-file = /var/lib/mysql/mysqld.pid | ||
14 | log-error = /var/log/mysqld.err | ||
15 | basedir = /usr | ||
16 | datadir = /var/mysql | ||
17 | skip-external-locking | ||
18 | skip-networking | ||
19 | ignore-builtin-innodb | ||
20 | default-storage-engine = myisam | ||
21 | bind-address = localhost | ||
22 | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service new file mode 100644 index 000000000..18ad8d54d --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/mysqld.service | |||
@@ -0,0 +1,15 @@ | |||
1 | [Unit] | ||
2 | Description=MariaDB database server | ||
3 | After=syslog.target | ||
4 | After=network.target | ||
5 | |||
6 | [Service] | ||
7 | Type=simple | ||
8 | User=mysql | ||
9 | Group=mysql | ||
10 | ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ | ||
11 | TimeoutSec=300 | ||
12 | PrivateTmp=true | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch b/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch new file mode 100644 index 000000000..ff26b0b86 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Remove host path from include directories | ||
2 | |||
3 | Naturally this breaks cross-compilation if present. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
8 | |||
9 | --- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:37:04.529327998 +0100 | ||
10 | +++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:43:56.991337895 +0100 | ||
11 | @@ -39,7 +39,6 @@ | ||
12 | |||
13 | ## default includes and libraries | ||
14 | include_directories(SYSTEM | ||
15 | - /usr/local/include | ||
16 | ${ZLIB_INCLUDE_DIRS} | ||
17 | ) | ||
18 | |||