diff options
| author | Zoltán Böszörményi <zboszor@gmail.com> | 2021-07-06 08:57:49 +0200 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-07-18 09:34:32 -0700 |
| commit | 13a011b4500f81d212408ba8f9894ed183c07fd1 (patch) | |
| tree | f14d63a4c5c8110a1c9165aadb15733480aab092 | |
| parent | 48a84cb8a18b291cb8a00de96a66176ed340f94b (diff) | |
| download | meta-openembedded-13a011b4500f81d212408ba8f9894ed183c07fd1.tar.gz | |
mariadb: Upgrade to 10.5.11
Forward port musl patches
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 287ffdf1d03731fadd6a90b224d08cf9a3b50de5)
[Stable branch]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb index 73b2a0980d..73b2a0980d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 7b1f537fb4..71978740ba 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
| @@ -25,7 +25,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz | |||
| 25 | " | 25 | " |
| 26 | SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" | 26 | SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" |
| 27 | 27 | ||
| 28 | SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" | 28 | SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" |
| 29 | 29 | ||
| 30 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" | 30 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" |
| 31 | 31 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index d082d424b0..d6e53c29e1 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch | |||
| @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 36 | + __builtin_ppc_get_timebase(); | 36 | + __builtin_ppc_get_timebase(); |
| 37 | #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) | 37 | #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) |
| 38 | /* Mainly, prevent the compiler from optimizing away delay loops */ | 38 | /* Mainly, prevent the compiler from optimizing away delay loops */ |
| 39 | __asm__ __volatile__ ("isb":::"memory"); | 39 | #ifdef _aarch64_ |
| 40 | --- a/storage/tokudb/PerconaFT/portability/toku_time.h | 40 | --- a/storage/tokudb/PerconaFT/portability/toku_time.h |
| 41 | +++ b/storage/tokudb/PerconaFT/portability/toku_time.h | 41 | +++ b/storage/tokudb/PerconaFT/portability/toku_time.h |
| 42 | @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v | 42 | @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb index 57d7736ea3..57d7736ea3 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb | |||