diff options
-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.inc | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/gcc7.patch | 13 | ||||
-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" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
6 | 6 | ||
7 | SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \ | 7 | SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ |
8 | file://fix-cmake-module-path.patch \ | 8 | file://fix-cmake-module-path.patch \ |
9 | file://remove-bad-path.patch \ | 9 | file://remove-bad-path.patch \ |
10 | file://fix-mysqlclient-r-version.patch \ | 10 | file://fix-mysqlclient-r-version.patch \ |
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P | |||
17 | file://fix-a-building-failure.patch \ | 17 | file://fix-a-building-failure.patch \ |
18 | file://change-cc-to-cc-version.patch \ | 18 | file://change-cc-to-cc-version.patch \ |
19 | file://0001-disable-ucontext-on-musl.patch \ | 19 | file://0001-disable-ucontext-on-musl.patch \ |
20 | file://gcc7.patch \ | ||
21 | " | 20 | " |
22 | SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd" | 21 | |
23 | SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86" | 22 | SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4" |
23 | SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641" | ||
24 | 24 | ||
25 | S = "${WORKDIR}/mariadb-${PV}" | 25 | S = "${WORKDIR}/mariadb-${PV}" |
26 | 26 | ||
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 @@ | |||
1 | Index: mariadb-5.5.55/client/mysql.cc | ||
2 | =================================================================== | ||
3 | --- mariadb-5.5.55.orig/client/mysql.cc | ||
4 | +++ mariadb-5.5.55/client/mysql.cc | ||
5 | @@ -2850,7 +2850,7 @@ You can turn off this feature to get a q | ||
6 | mysql_free_result(fields); | ||
7 | break; | ||
8 | } | ||
9 | - field_names[i][num_fields*2]= '\0'; | ||
10 | + field_names[i][num_fields*2][0]= '\0'; | ||
11 | j=0; | ||
12 | while ((sql_field=mysql_fetch_field(fields))) | ||
13 | { | ||
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 | |||