diff options
| author | Zoltán Böszörményi <zboszor@gmail.com> | 2021-07-06 08:57:49 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-07-08 09:21:40 -0700 |
| commit | 287ffdf1d03731fadd6a90b224d08cf9a3b50de5 (patch) | |
| tree | ef6c2825658873805f16c31e56cd675274d00beb /meta-oe/recipes-dbs | |
| parent | 6f05b2463a20f99d43c5a7db190dfe3490929247 (diff) | |
| download | meta-openembedded-287ffdf1d03731fadd6a90b224d08cf9a3b50de5.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>
Diffstat (limited to 'meta-oe/recipes-dbs')
| -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 73b2a0980..73b2a0980 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 7b1f537fb..71978740b 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 d082d424b..d6e53c29e 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 57d7736ea..57d7736ea 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb | |||