aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-08-17 17:28:28 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 10:11:53 +0200
commitea0e706a226b0a95bd3e6b076bd9ced027a38efd (patch)
tree93c5dba9f26ab892b30649f461630f5199b0adfb
parent28d2c9b4474844516a9e8328bb497cdf3bec88ef (diff)
downloadmeta-openembedded-contrib-ea0e706a226b0a95bd3e6b076bd9ced027a38efd.tar.gz
mariadb: 5.5.55 -> 5.5.57
Upgrade mariadb from 5.5.55 to 5.5.57. * update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57 * remove gcc7.patch which is not needed any more Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc8
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/gcc7.patch13
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.5.57.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb)0
4 files changed, 4 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
index 4ce960d7da..4ce960d7da 100644
--- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
+++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index fd9dcbd1ab..32e3eaa6d4 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
file://fix-cmake-module-path.patch \
file://remove-bad-path.patch \
file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
file://fix-a-building-failure.patch \
file://change-cc-to-cc-version.patch \
file://0001-disable-ucontext-on-musl.patch \
- file://gcc7.patch \
"
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
S = "${WORKDIR}/mariadb-${PV}"
diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
deleted file mode 100644
index 3e75b26c76..0000000000
--- a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
- mysql_free_result(fields);
- break;
- }
-- field_names[i][num_fields*2]= '\0';
-+ field_names[i][num_fields*2][0]= '\0';
- j=0;
- while ((sql_field=mysql_fetch_field(fields)))
- {
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
index d7895732a6..d7895732a6 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
+++ b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb