diff options
author | Kang Kai <kai.kang@windriver.com> | 2014-11-18 17:54:36 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-24 11:59:51 +0100 |
commit | 6db864c93193c6e353ef37160e8ff1bcfb8f5337 (patch) | |
tree | c7cdb66bb0e276381ba63a08a11006abe5fd26b5 /meta-oe/recipes-support/mysql | |
parent | 7813f6d7b7a7abe70a8c8e0409f764d77af4a0b5 (diff) | |
download | meta-openembedded-6db864c93193c6e353ef37160e8ff1bcfb8f5337.tar.gz |
mariadb: Update from version 5.5.39 to 5.5.40
* rename mariadb_5.5.39.inc -> mariadb.inc
* add dependency bision-native for mariadb-native
* add revert-fix-for-MDEV-5120.patch to revert an commit for mariadb test suite
which causes packages mysql-python and modphp fail to build
* add PACKAGECONFIG 'libedit'
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.39.inc) | 6 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch | 46 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.40.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.39.bb) | 3 |
4 files changed, 53 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb index 9148deefc..4ce960d7d 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | require mariadb_${PV}.inc | 1 | require mariadb.inc |
2 | inherit native | 2 | inherit native |
3 | 3 | ||
4 | PROVIDES += "mysql5-native" | 4 | PROVIDES += "mysql5-native" |
5 | DEPENDS = "ncurses-native zlib-native" | 5 | DEPENDS = "ncurses-native zlib-native bison-native" |
6 | 6 | ||
7 | RDEPENDS_${PN} = "" | 7 | RDEPENDS_${PN} = "" |
8 | PACKAGES = "" | 8 | PACKAGES = "" |
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb.inc index f9909ebd0..3d0f5939d 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc | |||
@@ -11,10 +11,11 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ | |||
11 | file://my.cnf \ | 11 | file://my.cnf \ |
12 | file://mysqld.service \ | 12 | file://mysqld.service \ |
13 | file://configure.cmake-fix-valgrind.patch \ | 13 | file://configure.cmake-fix-valgrind.patch \ |
14 | file://revert-fix-for-MDEV-5120.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd" | 17 | SRC_URI[md5sum] = "561bede89a8bd19c374dad2d8f24fdfe" |
17 | SRC_URI[sha256sum] = "cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14" | 18 | SRC_URI[sha256sum] = "cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a" |
18 | 19 | ||
19 | S = "${WORKDIR}/mariadb-${PV}" | 20 | S = "${WORKDIR}/mariadb-${PV}" |
20 | 21 | ||
@@ -40,6 +41,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} | |||
40 | PACKAGECONFIG_class-native = "" | 41 | PACKAGECONFIG_class-native = "" |
41 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" | 42 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" |
42 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" | 43 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" |
44 | PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" | ||
43 | 45 | ||
44 | # MariaDB doesn't link properly with gold | 46 | # MariaDB doesn't link properly with gold |
45 | # https://mariadb.atlassian.net/browse/MDEV-5982 | 47 | # https://mariadb.atlassian.net/browse/MDEV-5982 |
diff --git a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch new file mode 100644 index 000000000..41493a1c5 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Revert mariadb commit revno 4300 in branch 5.5 which fixes | ||
2 | https://mariadb.atlassian.net/browse/MDEV-5120. | ||
3 | |||
4 | ------------------------------------------------------------ | ||
5 | revno: 4300 | ||
6 | fixes bug: https://mariadb.atlassian.net/browse/MDEV-5120 | ||
7 | committer: Sergei Golubchik <sergii@pisem.net> | ||
8 | branch nick: 5.5 | ||
9 | timestamp: Thu 2014-10-02 11:57:40 +0200 | ||
10 | message: | ||
11 | MDEV-5120 Test suite test maria-no-logging fails | ||
12 | |||
13 | stat structure (from <sys/stat.h>) is conditionally defined | ||
14 | to have different layout and size depending on the defined macros. | ||
15 | The correct macro is defined in my_config.h, which means it MUST be | ||
16 | included first (or, at least before <features.h> - so, practically, | ||
17 | before including any system headers). | ||
18 | ------------------------------------------------------------ | ||
19 | |||
20 | It causes modphp fails to build. Bug MDEV-5120 is an test suite test | ||
21 | maria-no-logging fails. There is no side effect to revert it. | ||
22 | |||
23 | Upstream-Status: Backport | ||
24 | |||
25 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
26 | --- | ||
27 | --- mariadb-5.5.40/config.h.cmake.orig 2014-11-13 14:23:50.868147145 +0800 | ||
28 | +++ mariadb-5.5.40/config.h.cmake 2014-11-13 14:24:23.372148031 +0800 | ||
29 | @@ -641,17 +641,4 @@ | ||
30 | #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ | ||
31 | #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ | ||
32 | |||
33 | -/* | ||
34 | - stat structure (from <sys/stat.h>) is conditionally defined | ||
35 | - to have different layout and size depending on the defined macros. | ||
36 | - The correct macro is defined in my_config.h, which means it MUST be | ||
37 | - included first (or at least before <features.h> - so, practically, | ||
38 | - before including any system headers). | ||
39 | - | ||
40 | - __GLIBC__ is defined in <features.h> | ||
41 | -*/ | ||
42 | -#ifdef __GLIBC__ | ||
43 | -#error <my_config.h> MUST be included first! | ||
44 | -#endif | ||
45 | - | ||
46 | #endif | ||
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb index fee5b6297..f24cb4346 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require ${PN}_${PV}.inc | 1 | require mariadb.inc |
2 | 2 | ||
3 | EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" | 3 | EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" |
4 | 4 | ||
@@ -25,4 +25,3 @@ RCONFLICTS_${PN}-client += "mysql5-client" | |||
25 | RPROVIDES_${PN}-server += "mysql5-server" | 25 | RPROVIDES_${PN}-server += "mysql5-server" |
26 | RREPLACES_${PN}-server += "mysql5-server" | 26 | RREPLACES_${PN}-server += "mysql5-server" |
27 | RCONFLICTS_${PN}-server += "mysql5-server" | 27 | RCONFLICTS_${PN}-server += "mysql5-server" |
28 | |||