Recipe upgrades

PATCH In review Paul Eggleton 2 participants 14 messages Aug 5, 2014 – Aug 8, 2014

Share & tools

Paul Eggleton

author

2014-08-05 13:21 UTC #0 lore raw

cover Recipe upgrades

The usual series of recipe upgrades for Apache / (mod-)PHP / phpMyAdmin; however current phpMyAdmin now refuses to work with MariaDB/MySQL older than 5.5. We shouldn't be shipping 5.1 anymore anyway since it's unmaintained, so I went ahead with the upgrade, which turned out to be quite a pain :( It's now working, and build-wise it's a significant improvement. However, there has been a fairly major increase in package size, so we ought to be going through and trying to trim things down where possible. I don't really have time (nor, to be honest, enough specific knowledge of MariaDB/MySQL) to do this, so if anyone feels like diving in and doing that, please do.

The following changes since commit 7d9440a1e7bdf69403c55d1d21c7d1db1f07969e:

concurrencykit: fix SRC_URI, add PV, inherit autotools-brokensep (2014-08-05 12:02:42 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/upgrades4
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/upgrades4

Paul Eggleton (5):
apache2: do not patch generated file
apache2: update to 2.4.10
modphp: update to 5.5.15
phpmyadmin: update to 4.2.7
mariadb: update to 5.5.38

 ...b-native_5.1.67.bb => mariadb-native_5.5.38.bb} |   5 +-
 .../mysql/mariadb/Makefile.am.patch                |  19 -
 .../mariadb/avoid-plugin-options-warnings.patch    |  17 -
 .../mysql/mariadb/configure-ps-cache-check.patch   |  27 --
 .../mysql/mariadb/configure.in.patch               |  13 -
 .../mysql/mariadb/fix-cmake-module-path.patch      |  29 ++
 .../mysql/mariadb/fix-cve-2013-1861-1.patch        | 174 ---------
 .../mysql/mariadb/fix-cve-2013-1861-2.patch        | 257 -------------
 .../mysql/mariadb/fix-link-error-ub1310.patch      |  37 --
 .../mysql/mariadb/fix-mysqlclient-r-version.patch  | 161 ++++++++
 .../mysql/mariadb/fix_host_path.patch              |  37 --
 .../recipes-support/mysql/mariadb/misc.m4.patch    |  13 -
 meta-oe/recipes-support/mysql/mariadb/my.cnf       |   1 +
 meta-oe/recipes-support/mysql/mariadb/mysqld.sh    |  24 --
 .../recipes-support/mysql/mariadb/plug.in.patch    | 405 ---------------------
 .../mysql/mariadb/remove-bad-path.patch            |  18 +
 ...orage-forbids-absolute-addresses-on-IA-32.patch |  44 ---
 .../mariadb/zlib-let-libdir-configurable.patch     |  63 ----
 .../mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} |   2 +
 .../{mariadb_5.1.67.inc => mariadb_5.5.38.inc}     | 113 +++---
 ...e2-native_2.4.9.bb => apache2-native_2.4.10.bb} |   4 +-
 .../apache2/apache2/apache-configure_perlbin.patch |  17 -
 .../{apache2_2.4.9.bb => apache2_2.4.10.bb}        |   4 +-
 meta-webserver/recipes-php/modphp/modphp5.inc      |   2 +-
 meta-webserver/recipes-php/modphp/modphp_5.5.12.bb |   7 -
 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb |   7 +
 .../{phpmyadmin_4.2.0.bb => phpmyadmin_4.2.7.bb}   |   4 +-
 27 files changed, 287 insertions(+), 1217 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.1.67.bb => mariadb-native_5.5.38.bb} (71%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.sh
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/plug.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} (94%)
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.inc => mariadb_5.5.38.inc} (68%)
 rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.9.bb => apache2-native_2.4.10.bb} (91%)
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.9.bb => apache2_2.4.10.bb} (97%)
 delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.12.bb
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.2.0.bb => phpmyadmin_4.2.7.bb} (87%)

Signature · 1 line

1.9.3

Paul Eggleton

author

2014-08-05 13:21 UTC #1 lore raw

PATCH 1/5 apache2: do not patch generated file

We already patch configure.ac and we're not bypassing autoreconf, so we don't need to patch configure as well.

Signed-off-by Paul Eggleton <[email protected]>

---
 .../apache2/apache2/apache-configure_perlbin.patch      | 17 -----------------
 1 file changed, 17 deletions(-)

meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch +0 ~~-17~~

index baa739f..c90279d 100644
@@ -4,23 +4,6 @@
 #
 # Upstream-Status: Inappropriate [configuration]
 
---- a/configure
-+++ b/configure
-@@ -22365,13 +22365,7 @@
- #define APACHE_MPM_DIR "$MPM_DIR"
- _ACEOF
-
--
--perlbin=`$ac_aux_dir/PrintPath perl`
--if test "x$perlbin" = "x"; then
--    perlbin="/replace/with/path/to/perl/interpreter"
--fi
--
--
-+perlbin='/usr/bin/perl'
-
- BSD_MAKEFILE=no
- ap_make_include=include
 --- a/configure.in
 +++ b/configure.in
 @@ -638,10 +638,7 @@

Signature · 1 line

1.9.3

Paul Eggleton

author

2014-08-05 13:21 UTC #2 lore raw

PATCH 2/5 apache2: update to 2.4.10

In reply to Paul Eggleton

Signed-off-by Paul Eggleton <[email protected]>

---
 .../apache2/{apache2-native_2.4.9.bb => apache2-native_2.4.10.bb}     | 4 ++--
 .../recipes-httpd/apache2/{apache2_2.4.9.bb => apache2_2.4.10.bb}     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.9.bb => apache2-native_2.4.10.bb} (91%)
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.9.bb => apache2_2.4.10.bb} (97%)

meta-webserver/recipes-httpd/apache2/apache2-native_2.4.10.bb renamed from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb +2 -2

similarity index 91%
rename from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb
rename to meta-webserver/recipes-httpd/apache2/apache2-native_2.4.10.bb
index 107480e..5963b79 100644
@@ -15,8 +15,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
 S = "${WORKDIR}/httpd-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "2ef4e65353497606b24fa9bb3e5a3c40"
-SRC_URI[sha256sum] = "f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603"
+SRC_URI[md5sum] = "44543dff14a4ebc1e9e2d86780507156"
+SRC_URI[sha256sum] = "176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
                 --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \

meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb +2 -2

similarity index 97%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index fd8ed92..614dd4e 100644
@@ -21,8 +21,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
            file://apache2-volatile.conf"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "2ef4e65353497606b24fa9bb3e5a3c40"
-SRC_URI[sha256sum] = "f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603"
+SRC_URI[md5sum] = "44543dff14a4ebc1e9e2d86780507156"
+SRC_URI[sha256sum] = "176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a"
 
 S = "${WORKDIR}/httpd-${PV}"

Signature · 1 line

1.9.3

Paul Eggleton

author

2014-08-05 13:21 UTC #3 lore raw

PATCH 3/5 modphp: update to 5.5.15

In reply to Paul Eggleton

LIC_FILES_CHKSUM changed since the copyright year changed.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-webserver/recipes-php/modphp/modphp5.inc      | 2 +-
 meta-webserver/recipes-php/modphp/modphp_5.5.12.bb | 7 -------
 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.12.bb
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb

meta-webserver/recipes-php/modphp/modphp5.inc +1 -1

index a1d550d..6932429 100644
@@ -12,7 +12,7 @@ SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/php-${PV}"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5bb09683f8f09b15b7076f4b4c31d61f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 
 inherit autotools

meta-webserver/recipes-php/modphp/modphp_5.5.12.bb deleted +0 -7

deleted file mode 100644
index 3f4e8f2..0000000
@@ -1,7 +0,0 @@
-include modphp5.inc
-
-EXTRA_OECONF += "--disable-opcache"
-
-SRC_URI[md5sum] = "943af92c2e67bba29429bdd9acf9cbd4"
-SRC_URI[sha256sum] = "519ee29e28532782676f3d8e31a808ffbfee383e0279ccc8cbd2b12ed53c2335"
-

meta-webserver/recipes-php/modphp/modphp_5.5.15.bb new file +7 -0

new file mode 100644
index 0000000..aed620f
@@ -0,0 +1,7 @@
+include modphp5.inc
+
+EXTRA_OECONF += "--disable-opcache"
+
+SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812"
+SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7"
+

Signature · 1 line

1.9.3

Paul Eggleton

author

2014-08-05 13:21 UTC #4 lore raw

PATCH 4/5 phpmyadmin: update to 4.2.7

In reply to Paul Eggleton

Note that this now requires MariaDB/MySQL 5.5+.

Signed-off-by Paul Eggleton <[email protected]>

---
 .../phpmyadmin/{phpmyadmin_4.2.0.bb => phpmyadmin_4.2.7.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.2.0.bb => phpmyadmin_4.2.7.bb} (87%)

meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.0.bb +2 -2

similarity index 87%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.0.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb
index 0298f6b..8054c35 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \
 SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \
            file://apache.conf"
 
-SRC_URI[md5sum] = "f787bcf5c98a1702d9c8c653e72eb689"
-SRC_URI[sha256sum] = "fef460aa493f696b8536c273ef126bb142b88dd15c7ef584aca90d2ea07d3bbc"
+SRC_URI[md5sum] = "0dcd755450dac819f33502590c88ad29"
+SRC_URI[sha256sum] = "5d101dd88a99a869bc0c684a7f687cf290abc4bf306daac73337cbde2d7743e4"
 
 S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"

Signature · 1 line

1.9.3

Paul Eggleton

author

2014-08-05 13:21 UTC #5 lore raw

PATCH 5/5 mariadb: update to 5.5.38

In reply to Paul Eggleton

* Upstream switched from autotools to cmake
* Separate build dir and parallel make now work
* Library versioning no longer used for plugins; other libtool cruft gone
* Proper upstream initscript
* Plugins moved from client library package to mariadb-server package (matches how Fedora packages these)

Signed-off-by Paul Eggleton <[email protected]>

---
 ...b-native_5.1.67.bb => mariadb-native_5.5.38.bb} |   5 +-
 .../mysql/mariadb/Makefile.am.patch                |  19 -
 .../mariadb/avoid-plugin-options-warnings.patch    |  17 -
 .../mysql/mariadb/configure-ps-cache-check.patch   |  27 --
 .../mysql/mariadb/configure.in.patch               |  13 -
 .../mysql/mariadb/fix-cmake-module-path.patch      |  29 ++
 .../mysql/mariadb/fix-cve-2013-1861-1.patch        | 174 ---------
 .../mysql/mariadb/fix-cve-2013-1861-2.patch        | 257 -------------
 .../mysql/mariadb/fix-link-error-ub1310.patch      |  37 --
 .../mysql/mariadb/fix-mysqlclient-r-version.patch  | 161 ++++++++
 .../mysql/mariadb/fix_host_path.patch              |  37 --
 .../recipes-support/mysql/mariadb/misc.m4.patch    |  13 -
 meta-oe/recipes-support/mysql/mariadb/my.cnf       |   1 +
 meta-oe/recipes-support/mysql/mariadb/mysqld.sh    |  24 --
 .../recipes-support/mysql/mariadb/plug.in.patch    | 405 ---------------------
 .../mysql/mariadb/remove-bad-path.patch            |  18 +
 ...orage-forbids-absolute-addresses-on-IA-32.patch |  44 ---
 .../mariadb/zlib-let-libdir-configurable.patch     |  63 ----
 .../mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} |   2 +
 .../{mariadb_5.1.67.inc => mariadb_5.5.38.inc}     | 113 +++---
 20 files changed, 273 insertions(+), 1186 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.1.67.bb => mariadb-native_5.5.38.bb} (71%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.sh
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/plug.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} (94%)
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.inc => mariadb_5.5.38.inc} (68%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +2 -3

similarity index 71%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb
index 942afcc..9148dee 100644
@@ -7,14 +7,13 @@ DEPENDS = "ncurses-native zlib-native"
 RDEPENDS_${PN} = ""
 PACKAGES = ""
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = " --with-embedded-server "
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
-    mv -f ${D}${libdir}/mysql/* ${D}${libdir}
-    rmdir ${D}${libdir}/mysql
 
     install -d ${D}${bindir}
     install -m 0755 sql/gen_lex_hash ${D}${bindir}/
+    install -m 0755 extra/comp_err ${D}${bindir}/
+    install -m 0755 scripts/comp_sql ${D}${bindir}/
 }

meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch deleted +0 ~~-19~~

deleted file mode 100644
index 33fd17a..0000000
@@ -1,19 +0,0 @@
-Index: mysql-5.1.40/sql/Makefile.am
-===================================================================
---- mysql-5.1.40.orig/sql/Makefile.am
-+++ mysql-5.1.40/sql/Makefile.am
-@@ -174,10 +174,10 @@ link_sources:
- # This generates lex_hash.h
- # NOTE Built sources should depend on their sources not the tool
- # this avoid the rebuild of the built files in a source dist
--lex_hash.h:	gen_lex_hash.cc lex.h
--		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--		./gen_lex_hash$(EXEEXT) > $@-t
--		$(MV) $@-t $@
-+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT)
-+
-+lex_hash.h:	gen_lex_hash$(EXEEXT)
-+		$(GEN_LEX_HASH) > $@
- 
- # For testing of udf_example.so
- udf_example_la_SOURCES= udf_example.c

meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch deleted +0 ~~-17~~

deleted file mode 100644
index 84ff6f0..0000000
@@ -1,17 +0,0 @@
-Tell autoconf about with-plugin option to avoid warnings like:
-configure: WARNING: unrecognized options: --with-plugin-maria
-
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Index: mariadb-5.1.67/config/ac-macros/plugins.m4
-===================================================================
---- mariadb-5.1.67.orig/config/ac-macros/plugins.m4
-+++ mariadb-5.1.67/config/ac-macros/plugins.m4
-@@ -38,6 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[
-   _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1])
-   m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])
-   m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])
-+  m4_ifdef([_AC_ENABLE_IF], [_AC_ENABLE_IF([with],[plugin-$1])])
-   _MYSQL_PLUGAPPEND_META([$1], $5)
-   ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[
-      MYSQL_PLUGIN_DIRECTORY([$1],

meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch deleted +0 ~~-27~~

deleted file mode 100644
index 3b5b3fd..0000000
@@ -1,27 +0,0 @@
-Index: mysql-4.1.22/configure.in
-===================================================================
---- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
-+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
-@@ -471,8 +471,8 @@
- 
- # Lock for PS
- AC_PATH_PROG(PS, ps, ps)
--AC_MSG_CHECKING("how to check if pid exists")
--PS=$ac_cv_path_PS
-+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
-+[
- # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
- then
-@@ -511,8 +511,9 @@
-       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
-   esac
- fi
--AC_SUBST(FIND_PROC)
--AC_MSG_RESULT("$FIND_PROC")
-+ac_cv_FIND_PROC="$FIND_PROC"
-+])
-+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)

meta-oe/recipes-support/mysql/mariadb/configure.in.patch deleted +0 ~~-13~~

deleted file mode 100644
index 6fe2dfa..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/configure.in
-===================================================================
---- mysql-5.1.40.orig/configure.in
-+++ mysql-5.1.40/configure.in
-@@ -226,8 +226,6 @@ else
-   AC_PATH_PROG(AS, as, as)
- fi
- 
--# Still need ranlib for readline; local static use only so no libtool.
--AC_PROG_RANLIB
- # We use libtool
- #AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL

meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch new file +29 -0

new file mode 100644
index 0000000..8d9f558
@@ -0,0 +1,29 @@
+Avoid CMAKE_MODULE_PATH being overwritten
+
+OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
+we set it after setting the project name.
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+Upstream-Status: Inappropriate [working around OE-Core bug]
+
+--- mariadb/CMakeLists.txt	2014-07-17 11:01:07.676353047 +0100
++++ mariadb/CMakeLists.txt	2014-07-17 11:01:31.299353107 +0100
+@@ -28,8 +28,6 @@
+ 
+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
+ 
+-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+-
+ # Distinguish between community and non-community builds, with the
+ # default being a community build. This does not impact the feature
+ # set that will be compiled in; it's merely provided as a hint to
+@@ -77,6 +75,8 @@
+ ENDIF()
+ PROJECT(${MYSQL_PROJECT_NAME})
+ 
++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
++
+ IF(BUILD_CONFIG)
+   INCLUDE(
+   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch deleted +0 ~~-174~~

174 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch deleted +0 ~~-257~~

257 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch deleted +0 ~~-37~~

deleted file mode 100644
index a528ea7..0000000
@@ -1,37 +0,0 @@
-mariadb-native: fix link error on Ubuntu 13.10
-
-Below errors only occurs on Ubuntu 13.10:
-
-$arch-linux-libtool: link: g++ ... -o .libs/mysqltest_embedded \
-    ../../libmysqld/.libs/libmysqld.so -ldl
-
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlopen'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlclose'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlerror'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlsym'
-
-GCC/ld verion on the host:
-    gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1
-    GNU ld (GNU Binutils for Ubuntu) 2.23.52.20130913
-
-This is a strange behavior on Ub13.10, it fails even '-ldl' in the
-link command line. Below fix will append '-ldl' to dependency_libs
-in libmysqld.la.
-
-Upstream-Status: Submitted [https://mariadb.atlassian.net/browse/MDEV-5362]
-
-Signed-off-by: Wenzong Fan <[email protected]>
-================================================
-diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
-index 7a2c92e..eee501e 100644
---- a/libmysqld/Makefile.am
-+++ b/libmysqld/Makefile.am
-@@ -92,7 +92,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.la \
-                 @ndbcluster_libs@ @NDB_SCI_LIBS@ \
- 		@mysql_embedded_plugin_libs@ \
- 		$(libevent_inc_libs) \
--		$(yassl_inc_libs)
-+		$(yassl_inc_libs) @LIBDL@
- 
- if HAVE_YASSL
- yassl_inc_libs=	$(top_builddir)/extra/yassl/src/libyassl.la \

meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch new file +161 -0

161 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch deleted +0 ~~-37~~

deleted file mode 100644
index 4f69cd5..0000000
@@ -1,37 +0,0 @@
---- mysql-4.1.22/configure.in.old	2008-09-18 20:11:15.000000000 -0500
-+++ mysql-4.1.22/configure.in	2008-09-18 20:12:28.000000000 -0500
-@@ -456,9 +456,9 @@ else
-   fi
- fi
- 
--AC_SUBST(HOSTNAME)
--AC_SUBST(PERL)
--AC_SUBST(PERL5)
-+AC_SUBST(HOSTNAME,/bin/hostname)
-+AC_SUBST(PERL,$(bindir)/perl)
-+AC_SUBST(PERL5,$(bindir)/perl)
- 
- # for build ndb docs
- 
-@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)
-+AC_SUBST(KILL,/bin/kill)
- AC_MSG_CHECKING("for kill switches")
--if $ac_cv_path_KILL -0 $$
-+if $KILL -0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
- elif kill -s 0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
- else
-   AC_MSG_WARN([kill -0 to check for pid seems to fail])
--    CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
-+    CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
- fi
- AC_SUBST(CHECK_PID)
- AC_MSG_RESULT("$CHECK_PID")

meta-oe/recipes-support/mysql/mariadb/misc.m4.patch deleted +0 ~~-13~~

deleted file mode 100644
index 7b0acff..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/config/ac-macros/misc.m4
-===================================================================
---- mysql-5.1.40.orig/config/ac-macros/misc.m4
-+++ mysql-5.1.40/config/ac-macros/misc.m4
-@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
-  {
-    exit (find_stack_direction() < 0);
-  }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
--   ac_cv_c_stack_direction=)])
-+   ac_cv_c_stack_direction=0)])
-  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
- ])dnl
-

meta-oe/recipes-support/mysql/mariadb/my.cnf +1 -0

index d174381..f2c9b90 100644
@@ -17,5 +17,6 @@ datadir 					= /var/mysql
 skip-external-locking
 skip-networking
 ignore-builtin-innodb
+default-storage-engine				= myisam
 bind-address					= localhost

meta-oe/recipes-support/mysql/mariadb/mysqld.sh deleted +0 ~~-24~~

deleted file mode 100644
index 479ebdb..0000000
@@ -1,24 +0,0 @@
-# MySQL init script
-
-. /etc/default/rcS
-
-case "$1" in
-	start)
-		/usr/bin/mysqld_safe &
-		;;
-	stop)
-		if test -f /var/lib/mysql/mysqld.pid ; then
-			PID=`cat /var/lib/mysql/mysqld.pid`
-			kill $PID
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
-		;;
-esac
-
-exit 0

meta-oe/recipes-support/mysql/mariadb/plug.in.patch deleted +0 ~~-405~~

405 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch new file +18 -0

new file mode 100644
index 0000000..ff26b0b
@@ -0,0 +1,18 @@
+Remove host path from include directories
+
+Naturally this breaks cross-compilation if present.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+--- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:37:04.529327998 +0100
++++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:43:56.991337895 +0100
+@@ -39,7 +39,6 @@
+ 
+ ## default includes and libraries
+ include_directories(SYSTEM
+-  /usr/local/include
+   ${ZLIB_INCLUDE_DIRS}
+   )
+

meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch deleted +0 ~~-44~~

44 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch deleted +0 ~~-63~~

63 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +2 -0

similarity index 94%
rename from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.38.bb
index 6ad1fe6..3b5ad3c 100644
@@ -1,5 +1,7 @@
 require ${PN}_${PV}.inc
 
+EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
+
 DEPENDS += "mariadb-native ncurses zlib"
 
 PROVIDES += "mysql5"

meta-oe/recipes-support/mysql/mariadb_5.5.38.inc renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +60 ~~-53~~

185 lines not on this page · raw message

Signature · 1 line

1.9.3

Martin Jansa

2014-08-06 19:22 UTC #6 lore raw

Re: [meta-oe][PATCH 5/5] mariadb: update to 5.5.38

Quoted 42 lines · Paul Eggleton

Signed-off-by Paul Eggleton <[email protected]>

---
 ...b-native_5.1.67.bb => mariadb-native_5.5.38.bb} |   5 +-
 .../mysql/mariadb/Makefile.am.patch                |  19 -
 .../mariadb/avoid-plugin-options-warnings.patch    |  17 -
 .../mysql/mariadb/configure-ps-cache-check.patch   |  27 --
 .../mysql/mariadb/configure.in.patch               |  13 -
 .../mysql/mariadb/fix-cmake-module-path.patch      |  29 ++
 .../mysql/mariadb/fix-cve-2013-1861-1.patch        | 174 ---------
 .../mysql/mariadb/fix-cve-2013-1861-2.patch        | 257 -------------
 .../mysql/mariadb/fix-link-error-ub1310.patch      |  37 --
 .../mysql/mariadb/fix-mysqlclient-r-version.patch  | 161 ++++++++
 .../mysql/mariadb/fix_host_path.patch              |  37 --
 .../recipes-support/mysql/mariadb/misc.m4.patch    |  13 -
 meta-oe/recipes-support/mysql/mariadb/my.cnf       |   1 +
 meta-oe/recipes-support/mysql/mariadb/mysqld.sh    |  24 --
 .../recipes-support/mysql/mariadb/plug.in.patch    | 405 ---------------------
 .../mysql/mariadb/remove-bad-path.patch            |  18 +
 ...orage-forbids-absolute-addresses-on-IA-32.patch |  44 ---
 .../mariadb/zlib-let-libdir-configurable.patch     |  63 ----
 .../mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} |   2 +
 .../{mariadb_5.1.67.inc => mariadb_5.5.38.inc}     | 113 +++---
 20 files changed, 273 insertions(+), 1186 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.1.67.bb => mariadb-native_5.5.38.bb} (71%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch

Quoted 8 lines

 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.sh
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/plug.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} (94%)
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.inc => mariadb_5.5.38.inc} (68%)

We've already discussed this on IRC, here is more details:

19:08:49 < JaMa> bluelightning: ping, mariadb is failing here (when building after world, not with minimal deps):
19:08:51 < JaMa> mariadb/5.5.38-r0/build'

19:08:51 < JaMa> | make -f dbug/CMakeFiles/t.dir/build.make dbug/CMakeFiles/t.dir/build
19:08:51 < JaMa> | ./factorial: 1: ./factorial: Syntax error: word unexpected (expecting ")")
19:08:51 < JaMa> | make[2]: *** [dbug/output1.r] Error 2

19:09:05 < JaMa> bluelightning: have you seen something like that before in your builds?
19:09:14 < bluelightning> I haven't, no
19:09:29 < bluelightning> I wonder what triggers it...
19:10:16 < JaMa> I would compare log.do_configure to see what's new, but both TMPDIRs are already gone so it will take some time 19:11:24 < bluelightning> hmm, ok... well I'm happy to hold until we figure out where the issue is

Failing version autodetected boost:

$ diff -uNr temp/log.do_configure
--- mariadb/5.5.38-r0/temp/log.do_configure.fail 2014-08-06 11:44:44.426248399 -0700
+++ mariadb/5.5.38-r0/temp/log.do_configure.ok   2014-08-06 11:57:23.110273393 -0700
@@ -727,9 +727,7 @@
 -- Looking for io_queue_init in aio - not found
 -- Check size of pthread_t
 -- Check size of pthread_t - done
--- Boost version: 1.55.0
--- Performing Test BOOST_OK
--- Performing Test BOOST_OK - Failed
+-- Could NOT find Boost
 -- Looking for include file netdb.h
 -- Looking for include file netdb.h - found
 -- Looking for include file security/pam_appl.h

Maybe that's not the only difference. Let me know if you can reproduce the issue after building boost before mariadb.

When it doesn't fail, it also reports some more autodetected dependencies:
WARNING: QA Issue: mariadb-client rdepends on readline but its not a build dependency? [build-deps]
WARNING: QA Issue: mariadb-leftovers rdepends on readline but its not a build dependency? [build-deps]

Regards,

Paul Eggleton

author

2014-08-07 13:32 UTC #7 lore raw

PATCH v2 1/1 mariadb: update to 5.5.38

Signed-off-by Paul Eggleton <[email protected]>

---

Changes since v1:
* Add readline and libaio to DEPENDS
* Disable usage of boost

(Also updated on the branch)

 ...b-native_5.1.67.bb => mariadb-native_5.5.38.bb} |   5 +-
 .../mysql/mariadb/Makefile.am.patch                |  19 -
 .../mariadb/avoid-plugin-options-warnings.patch    |  17 -
 .../mysql/mariadb/configure-ps-cache-check.patch   |  27 --
 .../mysql/mariadb/configure.in.patch               |  13 -
 .../mysql/mariadb/fix-cmake-module-path.patch      |  29 ++
 .../mysql/mariadb/fix-cve-2013-1861-1.patch        | 174 ---------
 .../mysql/mariadb/fix-cve-2013-1861-2.patch        | 257 -------------
 .../mysql/mariadb/fix-link-error-ub1310.patch      |  37 --
 .../mysql/mariadb/fix-mysqlclient-r-version.patch  | 161 ++++++++
 .../mysql/mariadb/fix_host_path.patch              |  37 --
 .../recipes-support/mysql/mariadb/misc.m4.patch    |  13 -
 meta-oe/recipes-support/mysql/mariadb/my.cnf       |   1 +
 meta-oe/recipes-support/mysql/mariadb/mysqld.sh    |  24 --
 .../recipes-support/mysql/mariadb/plug.in.patch    | 405 ---------------------
 .../mysql/mariadb/remove-bad-path.patch            |  18 +
 ...orage-forbids-absolute-addresses-on-IA-32.patch |  44 ---
 .../mariadb/zlib-let-libdir-configurable.patch     |  63 ----
 .../mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} |   4 +-
 .../{mariadb_5.1.67.inc => mariadb_5.5.38.inc}     | 114 +++---
 20 files changed, 275 insertions(+), 1187 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.1.67.bb => mariadb-native_5.5.38.bb} (71%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.sh
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/plug.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} (86%)
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.inc => mariadb_5.5.38.inc} (67%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +2 -3

similarity index 71%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb
index 942afcc..9148dee 100644
@@ -7,14 +7,13 @@ DEPENDS = "ncurses-native zlib-native"
 RDEPENDS_${PN} = ""
 PACKAGES = ""
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = " --with-embedded-server "
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
-    mv -f ${D}${libdir}/mysql/* ${D}${libdir}
-    rmdir ${D}${libdir}/mysql
 
     install -d ${D}${bindir}
     install -m 0755 sql/gen_lex_hash ${D}${bindir}/
+    install -m 0755 extra/comp_err ${D}${bindir}/
+    install -m 0755 scripts/comp_sql ${D}${bindir}/
 }

meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch deleted +0 ~~-19~~

deleted file mode 100644
index 33fd17a..0000000
@@ -1,19 +0,0 @@
-Index: mysql-5.1.40/sql/Makefile.am
-===================================================================
---- mysql-5.1.40.orig/sql/Makefile.am
-+++ mysql-5.1.40/sql/Makefile.am
-@@ -174,10 +174,10 @@ link_sources:
- # This generates lex_hash.h
- # NOTE Built sources should depend on their sources not the tool
- # this avoid the rebuild of the built files in a source dist
--lex_hash.h:	gen_lex_hash.cc lex.h
--		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--		./gen_lex_hash$(EXEEXT) > $@-t
--		$(MV) $@-t $@
-+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT)
-+
-+lex_hash.h:	gen_lex_hash$(EXEEXT)
-+		$(GEN_LEX_HASH) > $@
- 
- # For testing of udf_example.so
- udf_example_la_SOURCES= udf_example.c

meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch deleted +0 ~~-17~~

deleted file mode 100644
index 84ff6f0..0000000
@@ -1,17 +0,0 @@
-Tell autoconf about with-plugin option to avoid warnings like:
-configure: WARNING: unrecognized options: --with-plugin-maria
-
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Index: mariadb-5.1.67/config/ac-macros/plugins.m4
-===================================================================
---- mariadb-5.1.67.orig/config/ac-macros/plugins.m4
-+++ mariadb-5.1.67/config/ac-macros/plugins.m4
-@@ -38,6 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[
-   _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1])
-   m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])
-   m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])
-+  m4_ifdef([_AC_ENABLE_IF], [_AC_ENABLE_IF([with],[plugin-$1])])
-   _MYSQL_PLUGAPPEND_META([$1], $5)
-   ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[
-      MYSQL_PLUGIN_DIRECTORY([$1],

meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch deleted +0 ~~-27~~

deleted file mode 100644
index 3b5b3fd..0000000
@@ -1,27 +0,0 @@
-Index: mysql-4.1.22/configure.in
-===================================================================
---- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
-+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
-@@ -471,8 +471,8 @@
- 
- # Lock for PS
- AC_PATH_PROG(PS, ps, ps)
--AC_MSG_CHECKING("how to check if pid exists")
--PS=$ac_cv_path_PS
-+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
-+[
- # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
- then
-@@ -511,8 +511,9 @@
-       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
-   esac
- fi
--AC_SUBST(FIND_PROC)
--AC_MSG_RESULT("$FIND_PROC")
-+ac_cv_FIND_PROC="$FIND_PROC"
-+])
-+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)

meta-oe/recipes-support/mysql/mariadb/configure.in.patch deleted +0 ~~-13~~

deleted file mode 100644
index 6fe2dfa..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/configure.in
-===================================================================
---- mysql-5.1.40.orig/configure.in
-+++ mysql-5.1.40/configure.in
-@@ -226,8 +226,6 @@ else
-   AC_PATH_PROG(AS, as, as)
- fi
- 
--# Still need ranlib for readline; local static use only so no libtool.
--AC_PROG_RANLIB
- # We use libtool
- #AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL

meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch new file +29 -0

new file mode 100644
index 0000000..8d9f558
@@ -0,0 +1,29 @@
+Avoid CMAKE_MODULE_PATH being overwritten
+
+OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
+we set it after setting the project name.
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+Upstream-Status: Inappropriate [working around OE-Core bug]
+
+--- mariadb/CMakeLists.txt	2014-07-17 11:01:07.676353047 +0100
++++ mariadb/CMakeLists.txt	2014-07-17 11:01:31.299353107 +0100
+@@ -28,8 +28,6 @@
+ 
+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
+ 
+-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+-
+ # Distinguish between community and non-community builds, with the
+ # default being a community build. This does not impact the feature
+ # set that will be compiled in; it's merely provided as a hint to
+@@ -77,6 +75,8 @@
+ ENDIF()
+ PROJECT(${MYSQL_PROJECT_NAME})
+ 
++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
++
+ IF(BUILD_CONFIG)
+   INCLUDE(
+   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch deleted +0 ~~-174~~

174 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch deleted +0 ~~-257~~

257 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch deleted +0 ~~-37~~

deleted file mode 100644
index a528ea7..0000000
@@ -1,37 +0,0 @@
-mariadb-native: fix link error on Ubuntu 13.10
-
-Below errors only occurs on Ubuntu 13.10:
-
-$arch-linux-libtool: link: g++ ... -o .libs/mysqltest_embedded \
-    ../../libmysqld/.libs/libmysqld.so -ldl
-
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlopen'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlclose'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlerror'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlsym'
-
-GCC/ld verion on the host:
-    gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1
-    GNU ld (GNU Binutils for Ubuntu) 2.23.52.20130913
-
-This is a strange behavior on Ub13.10, it fails even '-ldl' in the
-link command line. Below fix will append '-ldl' to dependency_libs
-in libmysqld.la.
-
-Upstream-Status: Submitted [https://mariadb.atlassian.net/browse/MDEV-5362]
-
-Signed-off-by: Wenzong Fan <[email protected]>
-================================================
-diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
-index 7a2c92e..eee501e 100644
---- a/libmysqld/Makefile.am
-+++ b/libmysqld/Makefile.am
-@@ -92,7 +92,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.la \
-                 @ndbcluster_libs@ @NDB_SCI_LIBS@ \
- 		@mysql_embedded_plugin_libs@ \
- 		$(libevent_inc_libs) \
--		$(yassl_inc_libs)
-+		$(yassl_inc_libs) @LIBDL@
- 
- if HAVE_YASSL
- yassl_inc_libs=	$(top_builddir)/extra/yassl/src/libyassl.la \

meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch new file +161 -0

161 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch deleted +0 ~~-37~~

deleted file mode 100644
index 4f69cd5..0000000
@@ -1,37 +0,0 @@
---- mysql-4.1.22/configure.in.old	2008-09-18 20:11:15.000000000 -0500
-+++ mysql-4.1.22/configure.in	2008-09-18 20:12:28.000000000 -0500
-@@ -456,9 +456,9 @@ else
-   fi
- fi
- 
--AC_SUBST(HOSTNAME)
--AC_SUBST(PERL)
--AC_SUBST(PERL5)
-+AC_SUBST(HOSTNAME,/bin/hostname)
-+AC_SUBST(PERL,$(bindir)/perl)
-+AC_SUBST(PERL5,$(bindir)/perl)
- 
- # for build ndb docs
- 
-@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)
-+AC_SUBST(KILL,/bin/kill)
- AC_MSG_CHECKING("for kill switches")
--if $ac_cv_path_KILL -0 $$
-+if $KILL -0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
- elif kill -s 0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
- else
-   AC_MSG_WARN([kill -0 to check for pid seems to fail])
--    CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
-+    CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
- fi
- AC_SUBST(CHECK_PID)
- AC_MSG_RESULT("$CHECK_PID")

meta-oe/recipes-support/mysql/mariadb/misc.m4.patch deleted +0 ~~-13~~

deleted file mode 100644
index 7b0acff..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/config/ac-macros/misc.m4
-===================================================================
---- mysql-5.1.40.orig/config/ac-macros/misc.m4
-+++ mysql-5.1.40/config/ac-macros/misc.m4
-@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
-  {
-    exit (find_stack_direction() < 0);
-  }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
--   ac_cv_c_stack_direction=)])
-+   ac_cv_c_stack_direction=0)])
-  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
- ])dnl
-

meta-oe/recipes-support/mysql/mariadb/my.cnf +1 -0

index d174381..f2c9b90 100644
@@ -17,5 +17,6 @@ datadir 					= /var/mysql
 skip-external-locking
 skip-networking
 ignore-builtin-innodb
+default-storage-engine				= myisam
 bind-address					= localhost

meta-oe/recipes-support/mysql/mariadb/mysqld.sh deleted +0 ~~-24~~

deleted file mode 100644
index 479ebdb..0000000
@@ -1,24 +0,0 @@
-# MySQL init script
-
-. /etc/default/rcS
-
-case "$1" in
-	start)
-		/usr/bin/mysqld_safe &
-		;;
-	stop)
-		if test -f /var/lib/mysql/mysqld.pid ; then
-			PID=`cat /var/lib/mysql/mysqld.pid`
-			kill $PID
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
-		;;
-esac
-
-exit 0

meta-oe/recipes-support/mysql/mariadb/plug.in.patch deleted +0 ~~-405~~

405 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch new file +18 -0

new file mode 100644
index 0000000..ff26b0b
@@ -0,0 +1,18 @@
+Remove host path from include directories
+
+Naturally this breaks cross-compilation if present.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+--- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:37:04.529327998 +0100
++++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:43:56.991337895 +0100
+@@ -39,7 +39,6 @@
+ 
+ ## default includes and libraries
+ include_directories(SYSTEM
+-  /usr/local/include
+   ${ZLIB_INCLUDE_DIRS}
+   )
+

meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch deleted +0 ~~-44~~

44 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch deleted +0 ~~-63~~

63 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +3 -1

similarity index 86%
rename from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.38.bb
index 6ad1fe6..fee5b62 100644
@@ -1,6 +1,8 @@
 require ${PN}_${PV}.inc
 
-DEPENDS += "mariadb-native ncurses zlib"
+EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
+
+DEPENDS += "mariadb-native ncurses zlib readline libaio"
 
 PROVIDES += "mysql5"

meta-oe/recipes-support/mysql/mariadb_5.5.38.inc renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +61 ~~-53~~

186 lines not on this page · raw message

Signature · 1 line

1.9.3

Martin Jansa

2014-08-08 00:44 UTC #8 lore raw

Re: [meta-oe][PATCH v2] mariadb: update to 5.5.38

Quoted 8 lines · Paul Eggleton

* Upstream switched from autotools to cmake
* Separate build dir and parallel make now work
* Library versioning no longer used for plugins; other libtool cruft gone
* Proper upstream initscript
* Plugins moved from client library package to mariadb-server package (matches how Fedora packages these)

Quoted 6 lines

Signed-off-by Paul Eggleton <[email protected]>
---
Changes since v1:
* Add readline and libaio to DEPENDS
* Disable usage of boost

Thanks for update, I've found few more differences between failing (after building world) and working (with minimal deps) build:

646c646
< -- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - found
---

Quoted 1 line

-- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - not found

733c733
< -- Looking for include file security/pam_appl.h - found
---

Quoted 1 line

-- Looking for include file security/pam_appl.h - not found

759c759
< -- Looking for event.h - found
---

Quoted 1 line

-- Looking for event.h - not found

There is also floating systemtap-native dependency which enables DTRACE support in mariadb (see mariadb-5.5.38/cmake/dtrace.cmake).

And groff-native is the cause for following error:

| Scanning dependencies of target ps
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make -f dbug/CMakeFiles/ps.dir/build.make dbug/CMakeFiles/ps.dir/build
| make[2]: Entering directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles
| [ 84%] Generating example3.r
| cd /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && sed -e 's!\\!\\\\!g' </work/i586-oe-linux/mariadb/5.5.38-r0/mariadb-5.5.38/dbug/example3.c >example3.r
| /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles
| [ 84%] Generating output1.r, output2.r, output3.r, output4.r, output5.r
| cd /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && ./factorial 1 2 3 4 5 > output1.r
| ./factorial: /lib/i386-linux-gnu/libc.so.6: version `GLIBC_2.17' not found (required by ./factorial)
| make[2]: *** [dbug/output1.r] Error 1
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make[1]: *** [dbug/CMakeFiles/ps.dir/all] Error 2
| make[1]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make: *** [all] Error 2
| ERROR: oe_runmake failed

Adding -DGROFF=False -DNROFF=False to EXTRA_OECMAKE allowed me to build it after world, but please check other floating deps as well.

Thanks

Martin Jansa

2014-08-08 10:01 UTC #9 lore raw

Re: [meta-oe][PATCH v2] mariadb: update to 5.5.38

Quoted 55 lines · Martin Jansa

Quoted 8 lines · Paul Eggleton
* Upstream switched from autotools to cmake
* Separate build dir and parallel make now work
* Library versioning no longer used for plugins; other libtool cruft gone
* Proper upstream initscript
* Plugins moved from client library package to mariadb-server package (matches how Fedora packages these)
Quoted 6 lines
Signed-off-by Paul Eggleton <[email protected]>
---
Changes since v1:
* Add readline and libaio to DEPENDS
* Disable usage of boost
Thanks for update, I've found few more differences between failing (after building world) and working (with minimal deps) build:
646c646
< -- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - found
---
Quoted 1 line
-- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - not found
733c733
< -- Looking for include file security/pam_appl.h - found
---
Quoted 1 line
-- Looking for include file security/pam_appl.h - not found
759c759
< -- Looking for event.h - found
---
Quoted 1 line
-- Looking for event.h - not found
There is also floating systemtap-native dependency which enables DTRACE support in mariadb (see mariadb-5.5.38/cmake/dtrace.cmake).
And groff-native is the cause for following error:
| Scanning dependencies of target ps
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make -f dbug/CMakeFiles/ps.dir/build.make dbug/CMakeFiles/ps.dir/build
| make[2]: Entering directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles
| [ 84%] Generating example3.r
| cd /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && sed -e 's!\\!\\\\!g' </work/i586-oe-linux/mariadb/5.5.38-r0/mariadb-5.5.38/dbug/example3.c >example3.r
| /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles
| [ 84%] Generating output1.r, output2.r, output3.r, output4.r, output5.r
| cd /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && ./factorial 1 2 3 4 5 > output1.r
| ./factorial: /lib/i386-linux-gnu/libc.so.6: version `GLIBC_2.17' not found (required by ./factorial)
| make[2]: *** [dbug/output1.r] Error 1
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make[1]: *** [dbug/CMakeFiles/ps.dir/all] Error 2
| make[1]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make: *** [all] Error 2
| ERROR: oe_runmake failed

Quoted 1 line

Adding -DGROFF=False -DNROFF=False to EXTRA_OECMAKE allowed me to build it after world, but please check other floating deps as well.

And now it failed on jenkins builder (maybe because this one is using gold)

| cd /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/build/storage/myisam && /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/arm-oe-linux-gnueabi/arm-oe-linux-gnueabi-gcc  -DHAVE_CONFIG_H -Wall  -march=armv5te -marm -mthumb-interwork  --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm  -O2 -pipe -g -feliminate-unused-debug-types -fPIC -O2 -g -DNDEBUG -DDBUG_OFF -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/build/include -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/mariadb-5.5.38/include -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/mariadb-5.5.38/sql -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/mariadb-5.5.38/regex -I/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include     -fvisibility=hidden -o CMakeFiles/myisam.dir/mi_create.c.o   -c /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/mariadb-5.5.38/storage/myisam/mi_create.c
| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: error: /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/build/libmysql/libmysql_versions.ld:155:9: invalid use of VERSION in input file
| collect2: error: ld returned 1 exit status
| make[2]: *** [libmysql/libmysqlclient.so.18..0] Error 1
| make[2]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/mariadb/5.5.38-r0/build'
| make[1]: *** [libmysql/CMakeFiles/libmysql.dir/all] Error 2

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Paul Eggleton

author

2014-08-08 13:02 UTC #13 lore raw

Re: [meta-oe][PATCH v2] mariadb: update to 5.5.38

In reply to Martin Jansa

Quoted 30 lines · On Friday 08 August 2014 02:45:07 Martin Jansa wrote:

Quoted 7 lines · Paul Eggleton
* Upstream switched from autotools to cmake
* Separate build dir and parallel make now work
* Library versioning no longer used for plugins; other libtool cruft gone
* Proper upstream initscript
* Plugins moved from client library package to mariadb-server package
Quoted 8 lines
(matches how Fedora packages these)
Signed-off-by Paul Eggleton <[email protected]>
---
Changes since v1:
* Add readline and libaio to DEPENDS
* Disable usage of boost
Thanks for update, I've found few more differences between failing (after building world) and working (with minimal deps) build:
646c646
< -- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - found ---
Quoted 2 lines
-- Looking for include files valgrind/memcheck.h, valgrind/valgrind.h - not found
733c733
< -- Looking for include file security/pam_appl.h - found
---

Quoted 7 lines

Quoted 1 line
-- Looking for include file security/pam_appl.h - not found
759c759
< -- Looking for event.h - found
---
Quoted 1 line
-- Looking for event.h - not found

PAM is an issue, I will fix that one. The other two are unconditional checks, but actually making use of the dependency is off by default regardless of whether or not it is present (don't you just love consistency...)

Quoted 2 lines

There is also floating systemtap-native dependency which enables DTRACE support in mariadb (see mariadb-5.5.38/cmake/dtrace.cmake).

OK, I'll explicitly set ENABLE_DTRACE to FALSE then.

Quoted 24 lines

And groff-native is the cause for following error:

| Scanning dependencies of target ps
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make -f dbug/CMakeFiles/ps.dir/build.make dbug/CMakeFiles/ps.dir/build
| make[2]: Entering directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report
| /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles [ 84%] Generating
| example3.r
| cd /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && sed -e
| 's!\\!\\\\!g'
| </work/i586-oe-linux/mariadb/5.5.38-r0/mariadb-5.5.38/dbug/example3.c
| >example3.r /sysroots/x86_64-linux/usr/bin/cmake -E cmake_progress_report
| /work/i586-oe-linux/mariadb/5.5.38-r0/build/CMakeFiles [ 84%] Generating
| output1.r, output2.r, output3.r, output4.r, output5.r cd
| /work/i586-oe-linux/mariadb/5.5.38-r0/build/dbug && ./factorial 1 2 3 4 5
| > output1.r ./factorial: /lib/i386-linux-gnu/libc.so.6: version
| `GLIBC_2.17' not found (required by ./factorial) make[2]: ***
| [dbug/output1.r] Error 1
| make[2]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make[1]: *** [dbug/CMakeFiles/ps.dir/all] Error 2
| make[1]: Leaving directory `/work/i586-oe-linux/mariadb/5.5.38-r0/build'
| make: *** [all] Error 2
| ERROR: oe_runmake failed

Quoted 2 lines

Adding -DGROFF=False -DNROFF=False to EXTRA_OECMAKE allowed me to build it after world, but please check other floating deps as well.

OK, I'll add those.

Thanks,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Paul Eggleton

author

2014-08-08 13:05 UTC #10 lore raw

Re: [meta-oe][PATCH v2] mariadb: update to 5.5.38

In reply to Martin Jansa

Quoted 26 lines · On Friday 08 August 2014 12:02:08 Martin Jansa wrote:

And now it failed on jenkins builder (maybe because this one is using gold)

| cd
| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/build/storage/myisam &&
| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/
| arm-oe-linux-gnueabi/arm-oe-linux-gnueabi-gcc  -DHAVE_CONFIG_H -Wall 
| -march=armv5te -marm -mthumb-interwork 
| --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm 
| -O2 -pipe -g -feliminate-unused-debug-types -fPIC -O2 -g -DNDEBUG
| -DDBUG_OFF
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/build/include
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/include
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/sql
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/regex
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include
|     -fvisibility=hidden -o CMakeFiles/myisam.dir/mi_create.c.o   -c
| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/mariadb-5.5.38/storage/myisam/mi_create.c
| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libe
| xec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: error:

Quoted 8 lines

| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/build/libmysql/libmysql_versions.ld:155:9: invalid use
| of VERSION in input file collect2: error: ld returned 1 exit status
| make[2]: *** [libmysql/libmysqlclient.so.18..0] Error 1
| make[2]: Leaving directory
| `/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi
| /mariadb/5.5.38-r0/build' make[1]: ***
| [libmysql/CMakeFiles/libmysql.dir/all] Error 2

I'm really not sure what to do about this. There is a bug report about this here:

https://sourceware.org/bugzilla/show_bug.cgi?id=16895

Unfortunately there is no viable workaround or patch either in the linked gentoo/mariadb bugs.

Any suggestions?

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Martin Jansa

2014-08-08 13:52 UTC #11 lore raw

Re: [meta-oe][PATCH v2] mariadb: update to 5.5.38

Quoted 39 lines · Paul Eggleton

Quoted 26 lines · On Friday 08 August 2014 12:02:08 Martin Jansa wrote:

And now it failed on jenkins builder (maybe because this one is using gold)

| cd
| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/build/storage/myisam &&
| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/
| arm-oe-linux-gnueabi/arm-oe-linux-gnueabi-gcc  -DHAVE_CONFIG_H -Wall 
| -march=armv5te -marm -mthumb-interwork 
| --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm 
| -O2 -pipe -g -feliminate-unused-debug-types -fPIC -O2 -g -DNDEBUG
| -DDBUG_OFF
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/build/include
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/include
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/sql
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueab
| i/mariadb/5.5.38-r0/mariadb-5.5.38/regex
| -I/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include
|     -fvisibility=hidden -o CMakeFiles/myisam.dir/mi_create.c.o   -c
| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/mariadb-5.5.38/storage/myisam/mi_create.c
| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libe
| xec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: error:

Quoted 8 lines

| /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/
| mariadb/5.5.38-r0/build/libmysql/libmysql_versions.ld:155:9: invalid use
| of VERSION in input file collect2: error: ld returned 1 exit status
| make[2]: *** [libmysql/libmysqlclient.so.18..0] Error 1
| make[2]: Leaving directory
| `/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi
| /mariadb/5.5.38-r0/build' make[1]: ***
| [libmysql/CMakeFiles/libmysql.dir/all] Error 2

I'm really not sure what to do about this. There is a bug report about this here:

Quoted 6 lines

https://sourceware.org/bugzilla/show_bug.cgi?id=16895
Unfortunately there is no viable workaround or patch either in the linked gentoo/mariadb bugs.
Any suggestions?

When I've found this, I was looking on u-boot hack to use ld.bfd instead of default ld, maybe we can temporary add something similar here.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Paul Eggleton

author

2014-08-08 14:17 UTC #12 lore raw

PATCH v3 1/1 mariadb: update to 5.5.38

Signed-off-by Paul Eggleton <[email protected]>

---

Changes since v2:
* Disable floating dependency on libpam
* Disable floating dependency on systemtap-native by disabling dtrace
* Disable usage of groff/nroff
* Disable linking with gold

 ...b-native_5.1.67.bb => mariadb-native_5.5.38.bb} |   5 +-
 .../mysql/mariadb/Makefile.am.patch                |  19 -
 .../mariadb/avoid-plugin-options-warnings.patch    |  17 -
 .../mysql/mariadb/configure-ps-cache-check.patch   |  27 --
 .../mysql/mariadb/configure.in.patch               |  13 -
 .../mysql/mariadb/fix-cmake-module-path.patch      |  29 ++
 .../mysql/mariadb/fix-cve-2013-1861-1.patch        | 174 ---------
 .../mysql/mariadb/fix-cve-2013-1861-2.patch        | 257 -------------
 .../mysql/mariadb/fix-link-error-ub1310.patch      |  37 --
 .../mysql/mariadb/fix-mysqlclient-r-version.patch  | 161 ++++++++
 .../mysql/mariadb/fix_host_path.patch              |  37 --
 .../recipes-support/mysql/mariadb/misc.m4.patch    |  13 -
 meta-oe/recipes-support/mysql/mariadb/my.cnf       |   1 +
 meta-oe/recipes-support/mysql/mariadb/mysqld.sh    |  24 --
 .../recipes-support/mysql/mariadb/plug.in.patch    | 405 ---------------------
 .../mysql/mariadb/remove-bad-path.patch            |  18 +
 ...orage-forbids-absolute-addresses-on-IA-32.patch |  44 ---
 .../mariadb/zlib-let-libdir-configurable.patch     |  63 ----
 .../mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} |   4 +-
 .../{mariadb_5.1.67.inc => mariadb_5.5.38.inc}     | 125 ++++---
 20 files changed, 286 insertions(+), 1187 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.1.67.bb => mariadb-native_5.5.38.bb} (71%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/configure.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.sh
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/plug.in.patch
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.bb => mariadb_5.5.38.bb} (86%)
 rename meta-oe/recipes-support/mysql/{mariadb_5.1.67.inc => mariadb_5.5.38.inc} (64%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +2 -3

similarity index 71%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.38.bb
index 942afcc..9148dee 100644
@@ -7,14 +7,13 @@ DEPENDS = "ncurses-native zlib-native"
 RDEPENDS_${PN} = ""
 PACKAGES = ""
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = " --with-embedded-server "
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
-    mv -f ${D}${libdir}/mysql/* ${D}${libdir}
-    rmdir ${D}${libdir}/mysql
 
     install -d ${D}${bindir}
     install -m 0755 sql/gen_lex_hash ${D}${bindir}/
+    install -m 0755 extra/comp_err ${D}${bindir}/
+    install -m 0755 scripts/comp_sql ${D}${bindir}/
 }

meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch deleted +0 ~~-19~~

deleted file mode 100644
index 33fd17a..0000000
@@ -1,19 +0,0 @@
-Index: mysql-5.1.40/sql/Makefile.am
-===================================================================
---- mysql-5.1.40.orig/sql/Makefile.am
-+++ mysql-5.1.40/sql/Makefile.am
-@@ -174,10 +174,10 @@ link_sources:
- # This generates lex_hash.h
- # NOTE Built sources should depend on their sources not the tool
- # this avoid the rebuild of the built files in a source dist
--lex_hash.h:	gen_lex_hash.cc lex.h
--		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--		./gen_lex_hash$(EXEEXT) > $@-t
--		$(MV) $@-t $@
-+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT)
-+
-+lex_hash.h:	gen_lex_hash$(EXEEXT)
-+		$(GEN_LEX_HASH) > $@
- 
- # For testing of udf_example.so
- udf_example_la_SOURCES= udf_example.c

meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch deleted +0 ~~-17~~

deleted file mode 100644
index 84ff6f0..0000000
@@ -1,17 +0,0 @@
-Tell autoconf about with-plugin option to avoid warnings like:
-configure: WARNING: unrecognized options: --with-plugin-maria
-
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Index: mariadb-5.1.67/config/ac-macros/plugins.m4
-===================================================================
---- mariadb-5.1.67.orig/config/ac-macros/plugins.m4
-+++ mariadb-5.1.67/config/ac-macros/plugins.m4
-@@ -38,6 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[
-   _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1])
-   m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])
-   m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])
-+  m4_ifdef([_AC_ENABLE_IF], [_AC_ENABLE_IF([with],[plugin-$1])])
-   _MYSQL_PLUGAPPEND_META([$1], $5)
-   ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[
-      MYSQL_PLUGIN_DIRECTORY([$1],

meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch deleted +0 ~~-27~~

deleted file mode 100644
index 3b5b3fd..0000000
@@ -1,27 +0,0 @@
-Index: mysql-4.1.22/configure.in
-===================================================================
---- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
-+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
-@@ -471,8 +471,8 @@
- 
- # Lock for PS
- AC_PATH_PROG(PS, ps, ps)
--AC_MSG_CHECKING("how to check if pid exists")
--PS=$ac_cv_path_PS
-+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
-+[
- # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
- then
-@@ -511,8 +511,9 @@
-       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
-   esac
- fi
--AC_SUBST(FIND_PROC)
--AC_MSG_RESULT("$FIND_PROC")
-+ac_cv_FIND_PROC="$FIND_PROC"
-+])
-+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)

meta-oe/recipes-support/mysql/mariadb/configure.in.patch deleted +0 ~~-13~~

deleted file mode 100644
index 6fe2dfa..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/configure.in
-===================================================================
---- mysql-5.1.40.orig/configure.in
-+++ mysql-5.1.40/configure.in
-@@ -226,8 +226,6 @@ else
-   AC_PATH_PROG(AS, as, as)
- fi
- 
--# Still need ranlib for readline; local static use only so no libtool.
--AC_PROG_RANLIB
- # We use libtool
- #AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL

meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch new file +29 -0

new file mode 100644
index 0000000..8d9f558
@@ -0,0 +1,29 @@
+Avoid CMAKE_MODULE_PATH being overwritten
+
+OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
+we set it after setting the project name.
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+Upstream-Status: Inappropriate [working around OE-Core bug]
+
+--- mariadb/CMakeLists.txt	2014-07-17 11:01:07.676353047 +0100
++++ mariadb/CMakeLists.txt	2014-07-17 11:01:31.299353107 +0100
+@@ -28,8 +28,6 @@
+ 
+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
+ 
+-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+-
+ # Distinguish between community and non-community builds, with the
+ # default being a community build. This does not impact the feature
+ # set that will be compiled in; it's merely provided as a hint to
+@@ -77,6 +75,8 @@
+ ENDIF()
+ PROJECT(${MYSQL_PROJECT_NAME})
+ 
++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
++
+ IF(BUILD_CONFIG)
+   INCLUDE(
+   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch deleted +0 ~~-174~~

174 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch deleted +0 ~~-257~~

257 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix-link-error-ub1310.patch deleted +0 ~~-37~~

deleted file mode 100644
index a528ea7..0000000
@@ -1,37 +0,0 @@
-mariadb-native: fix link error on Ubuntu 13.10
-
-Below errors only occurs on Ubuntu 13.10:
-
-$arch-linux-libtool: link: g++ ... -o .libs/mysqltest_embedded \
-    ../../libmysqld/.libs/libmysqld.so -ldl
-
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlopen'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlclose'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlerror'
-    ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlsym'
-
-GCC/ld verion on the host:
-    gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1
-    GNU ld (GNU Binutils for Ubuntu) 2.23.52.20130913
-
-This is a strange behavior on Ub13.10, it fails even '-ldl' in the
-link command line. Below fix will append '-ldl' to dependency_libs
-in libmysqld.la.
-
-Upstream-Status: Submitted [https://mariadb.atlassian.net/browse/MDEV-5362]
-
-Signed-off-by: Wenzong Fan <[email protected]>
-================================================
-diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
-index 7a2c92e..eee501e 100644
---- a/libmysqld/Makefile.am
-+++ b/libmysqld/Makefile.am
-@@ -92,7 +92,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.la \
-                 @ndbcluster_libs@ @NDB_SCI_LIBS@ \
- 		@mysql_embedded_plugin_libs@ \
- 		$(libevent_inc_libs) \
--		$(yassl_inc_libs)
-+		$(yassl_inc_libs) @LIBDL@
- 
- if HAVE_YASSL
- yassl_inc_libs=	$(top_builddir)/extra/yassl/src/libyassl.la \

meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch new file +161 -0

161 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch deleted +0 ~~-37~~

deleted file mode 100644
index 4f69cd5..0000000
@@ -1,37 +0,0 @@
---- mysql-4.1.22/configure.in.old	2008-09-18 20:11:15.000000000 -0500
-+++ mysql-4.1.22/configure.in	2008-09-18 20:12:28.000000000 -0500
-@@ -456,9 +456,9 @@ else
-   fi
- fi
- 
--AC_SUBST(HOSTNAME)
--AC_SUBST(PERL)
--AC_SUBST(PERL5)
-+AC_SUBST(HOSTNAME,/bin/hostname)
-+AC_SUBST(PERL,$(bindir)/perl)
-+AC_SUBST(PERL5,$(bindir)/perl)
- 
- # for build ndb docs
- 
-@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)
-+AC_SUBST(KILL,/bin/kill)
- AC_MSG_CHECKING("for kill switches")
--if $ac_cv_path_KILL -0 $$
-+if $KILL -0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
- elif kill -s 0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
- else
-   AC_MSG_WARN([kill -0 to check for pid seems to fail])
--    CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
-+    CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
- fi
- AC_SUBST(CHECK_PID)
- AC_MSG_RESULT("$CHECK_PID")

meta-oe/recipes-support/mysql/mariadb/misc.m4.patch deleted +0 ~~-13~~

deleted file mode 100644
index 7b0acff..0000000
@@ -1,13 +0,0 @@
-Index: mysql-5.1.40/config/ac-macros/misc.m4
-===================================================================
---- mysql-5.1.40.orig/config/ac-macros/misc.m4
-+++ mysql-5.1.40/config/ac-macros/misc.m4
-@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
-  {
-    exit (find_stack_direction() < 0);
-  }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
--   ac_cv_c_stack_direction=)])
-+   ac_cv_c_stack_direction=0)])
-  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
- ])dnl
-

meta-oe/recipes-support/mysql/mariadb/my.cnf +1 -0

index d174381..f2c9b90 100644
@@ -17,5 +17,6 @@ datadir 					= /var/mysql
 skip-external-locking
 skip-networking
 ignore-builtin-innodb
+default-storage-engine				= myisam
 bind-address					= localhost

meta-oe/recipes-support/mysql/mariadb/mysqld.sh deleted +0 ~~-24~~

deleted file mode 100644
index 479ebdb..0000000
@@ -1,24 +0,0 @@
-# MySQL init script
-
-. /etc/default/rcS
-
-case "$1" in
-	start)
-		/usr/bin/mysqld_safe &
-		;;
-	stop)
-		if test -f /var/lib/mysql/mysqld.pid ; then
-			PID=`cat /var/lib/mysql/mysqld.pid`
-			kill $PID
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
-		;;
-esac
-
-exit 0

meta-oe/recipes-support/mysql/mariadb/plug.in.patch deleted +0 ~~-405~~

405 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch new file +18 -0

new file mode 100644
index 0000000..ff26b0b
@@ -0,0 +1,18 @@
+Remove host path from include directories
+
+Naturally this breaks cross-compilation if present.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+--- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:37:04.529327998 +0100
++++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt	2014-07-17 14:43:56.991337895 +0100
+@@ -39,7 +39,6 @@
+ 
+ ## default includes and libraries
+ include_directories(SYSTEM
+-  /usr/local/include
+   ${ZLIB_INCLUDE_DIRS}
+   )
+

meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch deleted +0 ~~-44~~

44 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch deleted +0 ~~-63~~

63 lines not on this page · raw message

meta-oe/recipes-support/mysql/mariadb_5.5.38.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +3 -1

similarity index 86%
rename from meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.38.bb
index 6ad1fe6..fee5b62 100644
@@ -1,6 +1,8 @@
 require ${PN}_${PV}.inc
 
-DEPENDS += "mariadb-native ncurses zlib"
+EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
+
+DEPENDS += "mariadb-native ncurses zlib readline libaio"
 
 PROVIDES += "mysql5"

meta-oe/recipes-support/mysql/mariadb_5.5.38.inc renamed from meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +72 ~~-53~~

197 lines not on this page · raw message

Signature · 1 line

1.9.3