summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2017-10-26 13:25:43 -0700
committerArmin Kuster <akuster808@gmail.com>2018-03-01 16:10:35 -0800
commit31f337c1af1223ca5e973f31c0cbc3599393e322 (patch)
tree45c12b18ca36312b5255a91eee9ff299dc717e31 /meta-oe/recipes-support/mysql
parent036b3e794650cfc92f2f983d860ce93575198b57 (diff)
downloadmeta-openembedded-31f337c1af1223ca5e973f31c0cbc3599393e322.tar.gz
mysql: move to recipes-dbs
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
-rw-r--r--meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb19
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc297
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch28
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch26
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch41
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch31
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch29
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch161
-rwxr-xr-xmeta-oe/recipes-support/mysql/mariadb/install_db13
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/install_db.service17
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/my.cnf25
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start66
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/mysqld.service25
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch18
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.5.57.bb27
-rw-r--r--meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb17
16 files changed, 0 insertions, 840 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
deleted file mode 100644
index 4ce960d7d..000000000
--- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require mariadb.inc
2inherit native
3
4PROVIDES += "mysql5-native"
5DEPENDS = "ncurses-native zlib-native bison-native"
6
7RDEPENDS_${PN} = ""
8PACKAGES = ""
9EXTRA_OEMAKE = ""
10
11do_install() {
12 oe_runmake 'DESTDIR=${D}' install
13
14 install -d ${D}${bindir}
15 install -m 0755 sql/gen_lex_hash ${D}${bindir}/
16 install -m 0755 extra/comp_err ${D}${bindir}/
17 install -m 0755 scripts/comp_sql ${D}${bindir}/
18}
19
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
deleted file mode 100644
index a29d441e1..000000000
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ /dev/null
@@ -1,297 +0,0 @@
1SUMMARY = "A robust, scalable, and reliable SQL server"
2HOMEPAGE = "http://mariadb.org"
3SECTION = "libs"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6
7SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
8 file://fix-cmake-module-path.patch \
9 file://remove-bad-path.patch \
10 file://fix-mysqlclient-r-version.patch \
11 file://my.cnf \
12 file://mysqld.service \
13 file://install_db.service \
14 file://install_db \
15 file://mysql-systemd-start \
16 file://configure.cmake-fix-valgrind.patch \
17 file://fix-a-building-failure.patch \
18 file://change-cc-to-cc-version.patch \
19 file://0001-disable-ucontext-on-musl.patch \
20 "
21
22SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
23SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
24
25S = "${WORKDIR}/mariadb-${PV}"
26
27BINCONFIG_GLOB = "mysql_config"
28
29inherit cmake gettext binconfig update-rc.d useradd systemd
30
31INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
32INITSCRIPT_NAME_${PN}-server = "mysqld"
33INITSCRIPT_PARAMS_${PN}-server ?= "start 45 5 . stop 45 0 6 1 ."
34
35USERADD_PACKAGES = "${PN}-server"
36USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql"
37GROUPADD_PARAM_${PN}-server = "--system mysql"
38
39INITSCRIPT_NAME_${PN}-setupdb = "install_db"
40INITSCRIPT_PARAMS_${PN}-setupdb ?= "defaults 44 44"
41
42SYSTEMD_PACKAGES = "${PN}-server ${PN}-setupdb"
43SYSTEMD_SERVICE_${PN}-server = "mysqld.service"
44SYSTEMD_AUTO_ENABLE_${PN}-server ?= "disable"
45
46SYSTEMD_SERVICE_${PN}-setupdb = "install_db.service"
47SYSTEMD_AUTO_ENABLE_${PN}-setupdb ?= "enable"
48ALLOW_EMPTY_${PN}-setupdb ?= "1"
49FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db"
50
51EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
52
53PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb"
54PACKAGECONFIG_class-native = ""
55PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam"
56PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
57PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit"
58PACKAGECONFIG[krb5] = ", ,krb5"
59PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb"
60
61# MariaDB doesn't link properly with gold
62# https://mariadb.atlassian.net/browse/MDEV-5982
63TARGET_CFLAGS += "-fuse-ld=bfd"
64
65BUILD_CFLAGS += "-fuse-ld=bfd"
66BUILD_CXXFLAGS += "-fuse-ld=bfd"
67
68EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
69 -DWITH_JEMALLOC=no \
70 -DWITHOUT_TOKUDB=TRUE \
71 -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \
72 -DGROFF=FALSE \
73 -DNROFF=FALSE \
74 -DENABLE_DTRACE=FALSE \
75 -DWITH_PIC=ON \
76 -DINSTALL_LAYOUT=RPM \
77 -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \
78 -DINSTALL_LIBDIR:PATH=${baselib} \
79 -DINSTALL_PLUGINDIR:PATH=${baselib}/plugin \
80 -DINSTALL_SYSCONFDIR:PATH=${sysconfdir} \
81 -DMYSQL_DATADIR:PATH=/var/mysql \
82 -DCAT_EXECUTABLE=`which cat` \
83 -DCMAKE_AR:FILEPATH=${AR}"
84
85# With Ninja it fails with:
86# make: *** No rule to make target `install'. Stop.
87OECMAKE_GENERATOR = "Unix Makefiles"
88
89ARM_INSTRUCTION_SET_armv4 = "arm"
90ARM_INSTRUCTION_SET_armv5 = "arm"
91
92do_configure_append() {
93 # handle distros with different values of ${libexecdir}
94 libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'`
95 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh
96 sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh
97 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh
98}
99
100do_generate_toolchain_file_append_class-native () {
101 # If these are set cmake will assume we're cross-compiling, which will
102 # result in certain things we want being disabled
103 sed -i "/set( CMAKE_SYSTEM_NAME/d" ${WORKDIR}/toolchain.cmake
104 sed -i "/set( CMAKE_SYSTEM_PROCESSOR/d" ${WORKDIR}/toolchain.cmake
105}
106
107do_compile_prepend_class-target () {
108 # These need to be in-tree or make will think they need to be built,
109 # and since we're cross-compiling that is disabled
110 cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra
111 cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts
112
113 if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then
114 if ! [ -e ${B}/include/openssl/kssl.h ] ; then
115 mkdir -p ${B}/include/openssl
116 echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h
117 echo "#define KSSL_H" >>${B}/include/openssl/kssl.h
118 echo "#include <openssl/opensslconf.h>">>${B}/include/openssl/kssl.h
119 echo "#endif" >>${B}/include/openssl/kssl.h
120 fi
121 fi
122}
123
124SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess"
125
126# We need to append this so it runs *after* binconfig's preprocess function
127#
128# We really don't care exactly what the directories were set to originally.
129# plugindir is not fixed, but we don't create any plugins.
130#
131mariadb_sysroot_preprocess () {
132 sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
133 sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
134}
135
136do_install() {
137 oe_runmake 'DESTDIR=${D}' install
138
139 install -d ${D}/${sysconfdir}/init.d
140 install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/
141 install -m 0755 ${WORKDIR}/install_db ${D}/${sysconfdir}/init.d/
142 mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld
143
144 install -d ${D}${systemd_unitdir}/system
145 install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system
146 install -m 0644 ${WORKDIR}/install_db.service ${D}${systemd_unitdir}/system
147 sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \
148 ${D}${systemd_unitdir}/system/install_db.service
149
150 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
151 install -d ${D}${sysconfdir}/tmpfiles.d
152 echo "f /var/log/mysqld.err 0640 mysql mysql -" \
153 > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf
154 fi
155 install -d ${D}${bindir}
156 install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir}
157 install -d ${D}${datadir}/doc/${PN}
158 if [ -f ${D}${datadir}/doc/README ]; then
159 mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/
160 fi
161}
162
163PACKAGES = "${PN}-dbg ${PN} \
164 libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \
165 libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \
166 libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers"
167CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf"
168CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf"
169CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf"
170
171FILES_${PN} = " "
172RDEPENDS_${PN} = "${PN}-client ${PN}-server"
173ALLOW_EMPTY_${PN} = "1"
174
175RDEPENDS_${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \
176 perl-module-fcntl perl-module-sys-hostname perl-module-ipc-open3 \
177 perl-module-exporter"
178RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \
179 perl-module-file-basename perl-module-file-path perl-module-sys-hostname \
180 perl-module-file-copy perl-module-file-temp perl-module-posix \
181 ${PN}-client libdbi-perl libdbd-mysql-perl"
182RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \
183 perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \
184 perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \
185 perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \
186 perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \
187 perl-module-io-socket-inet perl-module-io-select"
188RDEPENDS_${PN}-setupdb = "coreutils"
189
190# Allow old code to link to the backward compatible library
191RDEPENDS_libmysqlclient-dev = "libmysqlclient-r-dev"
192
193FILES_libmysqlclient = "\
194 ${libdir}/libmysqlclient.so.* \
195 ${sysconfdir}/my.cnf.d/client.cnf"
196FILES_libmysqlclient-dev = " \
197 ${includedir}/mysql/ \
198 ${libdir}/libmysqlclient.so \
199 ${sysconfdir}/aclocal \
200 ${bindir}/mysql_config"
201FILES_libmysqlclient-staticdev = "\
202 ${libdir}/*.a"
203FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
204 ${datadir}/mysql-test/lib/My/SafeProcess/.debug/my_safe_process"
205
206# Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0
207# which are intentionally non-PIC on 32-bit x86 (see e.g.
208# storage/xtradb/plug.in in the source)
209INSANE_SKIP_libmysqlclient_append_x86 = " textrel"
210
211FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
212FILES_libmysqlclient-r-dev = "\
213 ${libdir}/libmysqlclient_r.so"
214FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a"
215FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*"
216
217FILES_libmysqld = "\
218 ${libdir}/libmysqld.so.*"
219FILES_libmysqld-dev = "\
220 ${libdir}/libmysqld.so"
221
222FILES_${PN}-client = "\
223 ${bindir}/myisam_ftdump \
224 ${bindir}/mysql \
225 ${bindir}/mysql_client_test \
226 ${bindir}/mysql_client_test_embedded \
227 ${bindir}/mysql_find_rows \
228 ${bindir}/mysql_fix_extensions \
229 ${bindir}/mysql_waitpid \
230 ${bindir}/mysqlaccess \
231 ${bindir}/mysqladmin \
232 ${bindir}/mysqlbug \
233 ${bindir}/mysqlcheck \
234 ${bindir}/mysqldump \
235 ${bindir}/mysqldumpslow \
236 ${bindir}/mysqlimport \
237 ${bindir}/mysqlshow \
238 ${bindir}/mysqlslap \
239 ${bindir}/mysqltest_embedded \
240 ${libexecdir}/mysqlmanager \
241 ${sysconfdir}/my.cnf.d/mysql-clients.cnf"
242
243FILES_${PN}-server = "\
244 ${bindir}/comp_err \
245 ${bindir}/isamchk \
246 ${bindir}/isamlog \
247 ${bindir}/msql2mysql \
248 ${bindir}/my_print_defaults \
249 ${bindir}/myisamchk \
250 ${bindir}/myisamlog \
251 ${bindir}/myisampack \
252 ${bindir}/mysql_convert_table_format \
253 ${bindir}/mysql_fix_privilege_tables \
254 ${bindir}/mysql_install_db \
255 ${bindir}/mysql_secure_installation \
256 ${bindir}/mysql_setpermission \
257 ${bindir}/mysql-systemd-start \
258 ${bindir}/mysql_tzinfo_to_sql \
259 ${bindir}/mysql_upgrade \
260 ${bindir}/mysql_plugin \
261 ${bindir}/mysql_zap \
262 ${bindir}/mysqlbinlog \
263 ${bindir}/mysqld_multi \
264 ${bindir}/mysqld_safe \
265 ${bindir}/mysqld_safe_helper \
266 ${bindir}/mysqlhotcopy \
267 ${bindir}/mysqltest \
268 ${bindir}/ndb_delete_all \
269 ${bindir}/ndb_desc \
270 ${bindir}/ndb_drop_index \
271 ${bindir}/ndb_drop_table \
272 ${bindir}/ndb_mgm \
273 ${bindir}/ndb_restore \
274 ${bindir}/ndb_select_all \
275 ${bindir}/ndb_select_count \
276 ${bindir}/ndb_show_tables \
277 ${bindir}/ndb_waiter \
278 ${bindir}/pack_isam \
279 ${bindir}/perror \
280 ${bindir}/replace \
281 ${bindir}/resolve_stack_dump \
282 ${bindir}/resolveip \
283 ${libexecdir}/mysqld \
284 ${sbindir}/mysqld \
285 ${sbindir}/ndb_cpcd \
286 ${sbindir}/ndbd \
287 ${sbindir}/ndb_mgmd \
288 ${libdir}/plugin/*.so \
289 ${datadir}/mysql/ \
290 ${localstatedir}/mysql/ \
291 ${sysconfdir}/init.d/mysqld \
292 ${sysconfdir}/my.cnf \
293 ${sysconfdir}/my.cnf.d/server.cnf \
294 ${sysconfdir}/tmpfiles.d"
295
296DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
297FILES_${PN}-leftovers = "/"
diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch
deleted file mode 100644
index 60e9199f9..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 26 Mar 2017 14:30:33 -0700
4Subject: [PATCH] disable ucontext on musl
5
6musl does not have *contex() APIs even though it has ucontext.h header
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 include/my_context.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/include/my_context.h b/include/my_context.h
14index dd44103..9b28c17 100644
15--- a/include/my_context.h
16+++ b/include/my_context.h
17@@ -31,7 +31,7 @@
18 #define MY_CONTEXT_USE_X86_64_GCC_ASM
19 #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
20 #define MY_CONTEXT_USE_I386_GCC_ASM
21-#elif defined(HAVE_UCONTEXT_H)
22+#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H)
23 #define MY_CONTEXT_USE_UCONTEXT
24 #else
25 #define MY_CONTEXT_DISABLE
26--
272.12.1
28
diff --git a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch b/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch
deleted file mode 100644
index 02bda24f7..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1mariadb: replace the CC with CC_VERSION and CXX with CXX_VERSION
2
3mysqlbug.sh is a bug report script. It makes a report with the build information,
4including gcc version. The CC is the local path of gcc, which is useless for bug
5report, and the path may expose private information, so change it to CC_VERSION.
6
7Upstream-Status: Pending
8
9Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
10Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
11================================
12diff --git a/scripts/mysqlbug.sh.old b/scripts/mysqlbug.sh
13index e9df210..d4b8d53 100644
14--- a/scripts/mysqlbug.sh.old
15+++ b/scripts/mysqlbug.sh
16@@ -24,8 +24,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
17 COMPILATION_COMMENT="@COMPILATION_COMMENT@"
18 BUGmysql="maria-developers@lists.launchpad.net"
19 # This is set by configure
20-COMP_CALL_INFO="CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
21-COMP_RUN_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
22+COMP_CALL_INFO="CC='@CC_VERSION@' CFLAGS='@SAVE_CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
23+COMP_RUN_INFO="CC='@CC_VERSION@' CFLAGS='@CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
24 CONFIGURE_LINE="@CONF_COMMAND@"
25
26 LIBC_INFO=""
diff --git a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch
deleted file mode 100644
index e97def602..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 12 Nov 2014 03:09:10 -0500
4Subject: [PATCH] configure.cmake: fix valgrind
5
6Check valgrind headers only if WITH_VALGRIND is set.
7
8mariadb uses two macros for valgrind compilations:
9HAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND
10HAVE_VALGRIND - valgrind debug libraries is installed, set by auto check
11
12We would like to set them both by the configure option so that we can use
13PACKAGECONFIG to decide if valgrind is needed or not.
14
15Upstream-Status: Inappropriate [oe specific]
16
17Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
18---
19 configure.cmake | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/configure.cmake b/configure.cmake
23index 0bd7bbe..51a098f 100644
24--- a/configure.cmake
25+++ b/configure.cmake
26@@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
27
28 IF(WITH_VALGRIND)
29 SET(HAVE_valgrind 1)
30+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
31+ HAVE_VALGRIND)
32 ENDIF()
33
34-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
35- HAVE_VALGRIND)
36
37 #--------------------------------------------------------------------
38 # Check for IPv6 support
39--
402.0.0
41
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch
deleted file mode 100644
index 0c4e10237..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1[PATCH] fix a building failure
2
3Upstream-Status: Inappropriate [configuration]
4
5building failed since native does not generate import_executables.cmake
6In fact, our building system will export the needed commands
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9---
10 CMakeLists.txt | 5 -----
11 1 file changed, 5 deletions(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index c1ce1c5..83b3a7e 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE()
18
19 CHECK_JEMALLOC()
20
21-IF(CMAKE_CROSSCOMPILING)
22- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
23- INCLUDE(${IMPORT_EXECUTABLES})
24-ENDIF()
25-
26 #
27 # Setup maintainer mode options by the end. Platform checks are
28 # not run with the warning options as to not perturb fragile checks
29--
301.9.1
31
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
deleted file mode 100644
index 8d9f558d0..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Avoid CMAKE_MODULE_PATH being overwritten
2
3OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
4we set it after setting the project name.
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Upstream-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
deleted file mode 100644
index 7516619eb..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
+++ /dev/null
@@ -1,161 +0,0 @@
1From 6db2a606196fb38a6d106dc409eee1cb9a40a440 Mon Sep 17 00:00:00 2001
2From: Tor Didriksen <tor.didriksen@oracle.com>
3Date: Mon, 24 Jun 2013 17:15:35 +0200
4Subject: [PATCH] Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18
5
6With this patch, the libmysql/ directory contains:
7libmysqlclient.a
8libmysqlclient_r.a -> libmysqlclient.a
9libmysqlclient_r.so -> libmysqlclient.so*
10libmysqlclient_r.so.18 -> libmysqlclient.so.18*
11libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0*
12libmysqlclient.so -> libmysqlclient.so.18*
13libmysqlclient.so.18 -> libmysqlclient.so.18.1.0*
14libmysqlclient.so.18.1.0*
15
16This fixes libmysqlclient_r symlinks pointing to the unversioned
17libmysqlclient.so symlink (leading to package QA errors since the
18libmysqlclient-r package ends up depending on libmysqlclient-dev).
19
20Borrowed from MySQL 5.6 tree at https://github.com/percona/mysql/
21
22Upstream-Status: Pending
23
24Signed-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
32diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
33index 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}"
85diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
86index 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--
1602.0.3
161
diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db b/meta-oe/recipes-support/mysql/mariadb/install_db
deleted file mode 100755
index 512a7da7e..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/install_db
+++ /dev/null
@@ -1,13 +0,0 @@
1#! /bin/sh
2case "$1" in
3 start)
4 echo "Starting to install database for mariadb"
5 /usr/bin/mysql-systemd-start pre
6 echo "done."
7 ;;
8 *)
9 echo "Usage: /etc/init.d/install_db start"
10 exit 1
11esac
12
13exit 0
diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db.service b/meta-oe/recipes-support/mysql/mariadb/install_db.service
deleted file mode 100644
index c8369f569..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/install_db.service
+++ /dev/null
@@ -1,17 +0,0 @@
1#
2# Simple install MySQL database service file
3# It shoulb be done before mysqld.service
4
5[Unit]
6Description=Install MySQL Community Server Database
7After=network.target
8After=syslog.target
9Before=mysqld.service
10
11[Install]
12WantedBy=multi-user.target
13
14[Service]
15Type=oneshot
16ExecStart=@BINDIR@/mysql-systemd-start pre
17
diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf
deleted file mode 100644
index dc4c172e5..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/my.cnf
+++ /dev/null
@@ -1,25 +0,0 @@
1[client]
2#password = password
3port = 3306
4socket = /var/lib/mysql/mysql.sock
5
6[mysqld_safe]
7
8[mysqld]
9user = mysql
10port = 3306
11socket = /var/lib/mysql/mysql.sock
12pid-file = /var/lib/mysql/mysqld.pid
13log-error = /var/log/mysqld.err
14basedir = /usr
15datadir = /var/lib/mysql
16skip-external-locking
17skip-networking
18ignore-builtin-innodb
19default-storage-engine = myisam
20bind-address = localhost
21
22#
23# include all files from the config directory
24#
25!includedir /etc/my.cnf.d
diff --git a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start
deleted file mode 100644
index 189c02021..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start
+++ /dev/null
@@ -1,66 +0,0 @@
1#! /bin/sh
2#
3# Needed argument: pre | post
4#
5# pre mode : try to run mysql_install_db and fix perms and SELinux contexts
6# post mode : ping server until answer is received
7#
8
9get_option () {
10 local section=$1
11 local option=$2
12 local default=$3
13 ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
14 [ -z $ret ] && ret=$default
15 echo $ret
16}
17
18install_db () {
19 # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
20 datadir=$(get_option mysqld datadir "/var/lib/mysql")
21
22 # Restore log, dir, perms and SELinux contexts
23 [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
24 log=/var/log/mysqld.log
25 [ -e $log ] || touch $log
26 chmod 0640 $log
27 chown mysql:mysql $log || exit 1
28 if [ -x /usr/sbin/restorecon ]; then
29 /usr/sbin/restorecon "$datadir"
30 /usr/sbin/restorecon $log
31 fi
32
33 # If special mysql dir is in place, skip db install
34 [ -d "$datadir/mysql" ] && exit 0
35
36 # Create initial db
37 /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
38 exit 0
39}
40
41pinger () {
42 # Wait for ping to answer to signal startup completed,
43 # might take a while in case of e.g. crash recovery
44 # MySQL systemd service will timeout script if no answer
45 datadir=$(get_option mysqld datadir "/var/lib/mysql")
46 socket=$(get_option mysqld socket "$datadir/mysql.sock")
47 case $socket in
48 /*) adminsocket="$socket" ;;
49 *) adminsocket="$datadir/$socket" ;;
50 esac
51
52 while /bin/true ; do
53 sleep 1
54 mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
55 done
56 exit 0
57}
58
59# main
60case $1 in
61 "pre") install_db ;;
62 "post") pinger ;;
63esac
64
65exit 0
66
diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service
deleted file mode 100644
index d88361703..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/mysqld.service
+++ /dev/null
@@ -1,25 +0,0 @@
1[Unit]
2Description=MariaDB database server
3After=syslog.target
4After=network.target
5
6[Service]
7PIDFile=/var/lib/mysql/mysqld.pid
8Type=simple
9User=mysql
10Group=mysql
11
12# Execute post scripts as root
13PermissionsStartOnly=true
14
15# Start main service
16ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@
17
18# Don't signal startup success before a ping works
19ExecStartPost=@BINDIR@/mysql-systemd-start post
20
21TimeoutSec=300
22PrivateTmp=true
23
24[Install]
25WantedBy=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
deleted file mode 100644
index ff26b0b86..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Remove host path from include directories
2
3Naturally this breaks cross-compilation if present.
4
5Upstream-Status: Pending
6
7Signed-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
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
deleted file mode 100644
index d7895732a..000000000
--- a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1require mariadb.inc
2
3EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
4
5DEPENDS += "mariadb-native ncurses zlib readline libaio libevent"
6
7PROVIDES += "mysql5 libmysqlclient"
8
9RPROVIDES_${PN} += "mysql5"
10RREPLACES_${PN} += "mysql5"
11RCONFLICTS_${PN} += "mysql5"
12
13RPROVIDES_${PN}-dbg += "mysql5-dbg"
14RREPLACES_${PN}-dbg += "mysql5-dbg"
15RCONFLICTS_${PN}-dbg += "mysql5-dbg"
16
17RPROVIDES_${PN}-leftovers += "mysql5-leftovers"
18RREPLACES_${PN}-leftovers += "mysql5-leftovers"
19RCONFLICTS_${PN}-leftovers += "mysql5-leftovers"
20
21RPROVIDES_${PN}-client += "mysql5-client"
22RREPLACES_${PN}-client += "mysql5-client"
23RCONFLICTS_${PN}-client += "mysql5-client"
24
25RPROVIDES_${PN}-server += "mysql5-server"
26RREPLACES_${PN}-server += "mysql5-server"
27RCONFLICTS_${PN}-server += "mysql5-server"
diff --git a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
deleted file mode 100644
index ac0df4f06..000000000
--- a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1SUMMARY = "Python interface to MySQL"
2HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
3SECTION = "devel/python"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6
7DEPENDS = "mysql5"
8
9SRCNAME = "MySQL-python"
10
11SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip"
12SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
13SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
14
15S = "${WORKDIR}/${SRCNAME}-${PV}"
16
17inherit setuptools
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 06:32:19 +0000