[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-devel
Subject:    [oe] [hardknott 09/15] mariadb: Upgrade to 10.5.11
From:       "Armin Kuster" <akuster808 () gmail ! com>
Date:       2021-07-29 23:36:42
Message-ID: 13a011b4500f81d212408ba8f9894ed183c07fd1.1627593245.git.akuster808 () gmail ! com
[Download RAW message or body]

From: Zoltán Böszörményi <zboszor@gmail.com>

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>
---
 .../{mariadb-native_10.5.10.bb => mariadb-native_10.5.11.bb}    | 0
 meta-oe/recipes-dbs/mysql/mariadb.inc                           | 2 +-
 meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch    | 2 +-
 .../mysql/{mariadb_10.5.10.bb => mariadb_10.5.11.bb}            | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.10.bb => \
mariadb-native_10.5.11.bb} (100%)  rename \
meta-oe/recipes-dbs/mysql/{mariadb_10.5.10.bb => mariadb_10.5.11.bb} (100%)

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 similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
rename to 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  "
 SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
 
-SRC_URI[sha256sum] = \
"a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" \
+SRC_URI[sha256sum] = \
"761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a"  
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
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>
 +  __builtin_ppc_get_timebase();
  #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
    /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("isb":::"memory");
+ #ifdef _aarch64_
 --- a/storage/tokudb/PerconaFT/portability/toku_time.h
 +++ b/storage/tokudb/PerconaFT/portability/toku_time.h
 @@ -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 similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#92395): https://lists.openembedded.org/g/openembedded-devel/message/92395
Mute This Topic: https://lists.openembedded.org/mt/84540588/4455120
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [openembedded-devel@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]