Skip to contentSkip to conversation

mariadb: Upgrade to 10.5.10

PATCH In review Yu, Mingli 2 participants 4 messages Jul 27, 2021 – Jul 28, 2021

lore
Share & tools
lore

Yu, Mingli

author
#0 lore raw

PATCH 1/1 mariadb: Upgrade to 10.5.10

From: Khem Raj <[email protected]>

Drop fix-a-building-failure.patch because upstream has made is narrower to apply to emulator builds and not just any cross compiling builds

Add missing dependency on boost

(master rev: 2183f0894110a6913c44bee9a1f4b1cea7639bdc)

---
 ...ve_10.5.9.bb => mariadb-native_10.5.10.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 ++--
 ...ng-failure.patch => cross-compiling.patch} | 22 +++++--------------
 .../mysql/mariadb/ppc-remove-glibc-dep.patch  |  2 +-
 .../{mariadb_10.5.9.bb => mariadb_10.5.10.bb} |  2 +-
 5 files changed, 10 insertions(+), 20 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.9.bb => mariadb-native_10.5.10.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/mariadb/{fix-a-building-failure.patch => cross-compiling.patch} (61%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.9.bb => mariadb_10.5.10.bb} (85%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +2 -2
index 9833b2885..2974341bf 100644
@@ -11,7 +11,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
            file://install_db \
            file://mysql-systemd-start \
            file://configure.cmake-fix-valgrind.patch \
-           file://fix-a-building-failure.patch \
            file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \
            file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://0001-disable-ucontext-on-musl.patch \
@@ -22,10 +21,11 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
            file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
            file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
            file://sys_futex.patch \
+           file://cross-compiling.patch \
           "
 SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
 
-SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf"
+SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +6 -16
similarity index 61%
rename from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
rename to meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
index 9149ee21f..0f4815b18 100644
@@ -1,28 +1,21 @@
-From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Mon, 4 Mar 2019 01:11:30 -0800
-Subject: [PATCH] fix a building failure
-
-Upstream-Status: Inappropriate [configuration]
+This is not needed for OE builds
 
 building failed since native does not generate import_executables.cmake
 In fact, our building system will export the needed commands
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Roy Li <[email protected]>
 Signed-off-by: Mingli Yu <[email protected]>
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
+Signed-off-by: Khem Raj <[email protected]>
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc30750..4f9110e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -347,11 +347,6 @@ CHECK_PCRE()
+@@ -392,11 +392,6 @@ CHECK_PCRE()
  
  CHECK_SYSTEMD()
  
--IF(CMAKE_CROSSCOMPILING)
+-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
 -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
 -  INCLUDE(${IMPORT_EXECUTABLES})
 -ENDIF()
@@ -30,6 +23,3 @@ index fc30750..4f9110e 100644
  #
  # Setup maintainer mode options. Platform checks are
  # not run with the warning options as to not perturb fragile checks
--- 
-2.17.1
-
meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +1 -1
index 1ca86bcca..d082d424b 100644
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <[email protected]>
 +  __builtin_ppc_get_timebase();
  #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
    /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
+   __asm__ __volatile__ ("isb":::"memory");
 --- 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
meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +1 -1
similarity index 85%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
index e6743fe97..8ae8241b0 100644
@@ -2,7 +2,7 @@ require mariadb.inc
 
 EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
 
-DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
+DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
 
 PROVIDES += "mysql5 libmysqlclient"
 
Signature · 1 line
2.29.2
#1 lore raw
Quoted 6 lines · Mingli

From: Khem Raj <[email protected]>

Drop fix-a-building-failure.patch because upstream has made is narrower to apply to emulator builds and not just any cross compiling builds

Add missing dependency on boost

Thanks. I backported this a few days ago and is in stable/hardknott-nut

-armin

Quoted 125 lines

(master rev: 2183f0894110a6913c44bee9a1f4b1cea7639bdc)

---
 ...ve_10.5.9.bb => mariadb-native_10.5.10.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 ++--
 ...ng-failure.patch => cross-compiling.patch} | 22 +++++--------------
 .../mysql/mariadb/ppc-remove-glibc-dep.patch  |  2 +-
 .../{mariadb_10.5.9.bb => mariadb_10.5.10.bb} |  2 +-
 5 files changed, 10 insertions(+), 20 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.9.bb => mariadb-native_10.5.10.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/mariadb/{fix-a-building-failure.patch => cross-compiling.patch} (61%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.9.bb => mariadb_10.5.10.bb} (85%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +2 -2
index 9833b2885..2974341bf 100644
@@ -11,7 +11,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
            file://install_db \
            file://mysql-systemd-start \
            file://configure.cmake-fix-valgrind.patch \
-           file://fix-a-building-failure.patch \
            file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \
            file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://0001-disable-ucontext-on-musl.patch \
@@ -22,10 +21,11 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
            file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
            file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
            file://sys_futex.patch \
+           file://cross-compiling.patch \
           "
 SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
 
-SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf"
+SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +6 -16
similarity index 61%
rename from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
rename to meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
index 9149ee21f..0f4815b18 100644
@@ -1,28 +1,21 @@
-From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Mon, 4 Mar 2019 01:11:30 -0800
-Subject: [PATCH] fix a building failure
-
-Upstream-Status: Inappropriate [configuration]
+This is not needed for OE builds
 
 building failed since native does not generate import_executables.cmake
 In fact, our building system will export the needed commands
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Roy Li <[email protected]>
 Signed-off-by: Mingli Yu <[email protected]>
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
+Signed-off-by: Khem Raj <[email protected]>
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc30750..4f9110e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -347,11 +347,6 @@ CHECK_PCRE()
+@@ -392,11 +392,6 @@ CHECK_PCRE()
 
  CHECK_SYSTEMD()
 
--IF(CMAKE_CROSSCOMPILING)
+-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
 -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
 -  INCLUDE(${IMPORT_EXECUTABLES})
 -ENDIF()
@@ -30,6 +23,3 @@ index fc30750..4f9110e 100644
  #
  # Setup maintainer mode options. Platform checks are
  # not run with the warning options as to not perturb fragile checks
--- 
-2.17.1
-
meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +1 -1
index 1ca86bcca..d082d424b 100644
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <[email protected]>
 +  __builtin_ppc_get_timebase();
  #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
    /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
+   __asm__ __volatile__ ("isb":::"memory");
 --- 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
meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +1 -1
similarity index 85%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
index e6743fe97..8ae8241b0 100644
@@ -2,7 +2,7 @@ require mariadb.inc
 
 EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
 
-DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
+DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
 
 PROVIDES += "mysql5 libmysqlclient"
 
author
#2 lore raw
Quoted 11 lines · On 7/28/21 1:41 PM, akuster808 wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 6 lines · Mingli

From: Khem Raj <[email protected]>

Drop fix-a-building-failure.patch because upstream has made is narrower to apply to emulator builds and not just any cross compiling builds

Add missing dependency on boost

Thanks. I backported this a few days ago and is in stable/hardknott-nut

Thanks for your comments, but I didn't find the stable/hardknott-nut branch at https://git.openembedded.org/meta-openembedded/refs/heads

Thanks,

Quoted 128 lines

-armin

Quoted 125 lines

(master rev: 2183f0894110a6913c44bee9a1f4b1cea7639bdc)

---
  ...ve_10.5.9.bb => mariadb-native_10.5.10.bb} |  0
  meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 ++--
  ...ng-failure.patch => cross-compiling.patch} | 22 +++++--------------
  .../mysql/mariadb/ppc-remove-glibc-dep.patch  |  2 +-
  .../{mariadb_10.5.9.bb => mariadb_10.5.10.bb} |  2 +-
  5 files changed, 10 insertions(+), 20 deletions(-)

rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.9.bb => mariadb-native_10.5.10.bb} (100%) rename meta-oe/recipes-dbs/mysql/mariadb/{fix-a-building-failure.patch => cross-compiling.patch} (61%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.9.bb => mariadb_10.5.10.bb} (85%)

meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +2 -2
index 9833b2885..2974341bf 100644
@@ -11,7 +11,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
             file://install_db \
             file://mysql-systemd-start \
             file://configure.cmake-fix-valgrind.patch \
-           file://fix-a-building-failure.patch \
             file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \
             file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
             file://0001-disable-ucontext-on-musl.patch \
@@ -22,10 +21,11 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
             file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
             file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
             file://sys_futex.patch \
+           file://cross-compiling.patch \
            "
  SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
 
-SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf"
+SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb"
 
  UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +6 -16
similarity index 61%
rename from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
rename to meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
index 9149ee21f..0f4815b18 100644
@@ -1,28 +1,21 @@
-From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Mon, 4 Mar 2019 01:11:30 -0800
-Subject: [PATCH] fix a building failure
-
-Upstream-Status: Inappropriate [configuration]
+This is not needed for OE builds
 
  building failed since native does not generate import_executables.cmake
  In fact, our building system will export the needed commands
 
+Upstream-Status: Inappropriate [configuration]
+
  Signed-off-by: Roy Li <[email protected]>
  Signed-off-by: Mingli Yu <[email protected]>
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
+Signed-off-by: Khem Raj <[email protected]>
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc30750..4f9110e 100644
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
-@@ -347,11 +347,6 @@ CHECK_PCRE()
+@@ -392,11 +392,6 @@ CHECK_PCRE()
 
   CHECK_SYSTEMD()
 
--IF(CMAKE_CROSSCOMPILING)
+-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
  -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
  -  INCLUDE(${IMPORT_EXECUTABLES})
  -ENDIF()
@@ -30,6 +23,3 @@ index fc30750..4f9110e 100644
   #
   # Setup maintainer mode options. Platform checks are
   # not run with the warning options as to not perturb fragile checks
---
-2.17.1
-
meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +1 -1
index 1ca86bcca..d082d424b 100644
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <[email protected]>
  +  __builtin_ppc_get_timebase();
   #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
     /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
+   __asm__ __volatile__ ("isb":::"memory");
  --- 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
meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +1 -1
similarity index 85%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
index e6743fe97..8ae8241b0 100644
@@ -2,7 +2,7 @@ require mariadb.inc
 
  EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
 
-DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
+DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
 
  PROVIDES += "mysql5 libmysqlclient"
 
#3 lore raw
Quoted 11 lines · Mingli
Quoted 8 lines · On 7/28/21 1:41 PM, akuster808 wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 5 lines · Mingli

From: Khem Raj <[email protected]>

Drop fix-a-building-failure.patch because upstream has made is narrower to apply to emulator builds and not just any cross compiling builds

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Add missing dependency on boost

Thanks. I backported this a few days ago and is in stable/hardknott-nut

Thanks for your comments, but I didn't find the stable/hardknott-nut branch at https://git.openembedded.org/meta-openembedded/refs/heads

Sorry. its in the contrib one.
https://git.openembedded.org/meta-openembedded-contrib/commit/?h=stable/hardknott-nut&id=5a9c8a31b73e97a60cd682b53c2497f8d4835dc7

-armin

Quoted 158 lines

Thanks,

Quoted 155 lines

-armin

Quoted 152 lines

(master rev: 2183f0894110a6913c44bee9a1f4b1cea7639bdc)

---
  ...ve_10.5.9.bb => mariadb-native_10.5.10.bb} |  0 meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 ++-- ...ng-failure.patch => cross-compiling.patch} | 22
+++++--------------
  .../mysql/mariadb/ppc-remove-glibc-dep.patch  |  2 +- .../{mariadb_10.5.9.bb => mariadb_10.5.10.bb} |  2 +-

  5 files changed, 10 insertions(+), 20 deletions(-)

  rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.9.bb => mariadb-native_10.5.10.bb} (100%)
  rename meta-oe/recipes-dbs/mysql/mariadb/{fix-a-building-failure.patch => cross-compiling.patch} (61%)
  rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.9.bb => mariadb_10.5.10.bb} (85%)

meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +0 -0
index 9833b2885..2974341bf 100644
@@ -11,7 +11,6 @@ SRC_URI =

"https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://install_db \
             file://mysql-systemd-start \
             file://configure.cmake-fix-valgrind.patch \
-           file://fix-a-building-failure.patch \
file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \
file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
             file://0001-disable-ucontext-on-musl.patch \

meta-oe/recipes-dbs/mysql/mariadb.inc +0 -0
@@ -22,10 +21,11 @@ SRC_URI =

"https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
             file://sys_futex.patch \
+           file://cross-compiling.patch \
            "
  SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"

-SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf" +SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb"

  UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"

diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch similarity index 61%
rename from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch rename to meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch index 9149ee21f..0f4815b18 100644

meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +1 -6
@@ -1,28 +1,21 @@
-From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Mon, 4 Mar 2019 01:11:30 -0800
-Subject: [PATCH] fix a building failure
-
-Upstream-Status: Inappropriate [configuration]
+This is not needed for OE builds
 

  building failed since native does not generate import_executables.cmake
  In fact, our building system will export the needed commands

meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +2 -0
+Upstream-Status: Inappropriate [configuration]
+

----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)

meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +1 -2
+Signed-off-by: Khem Raj <[email protected]>
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc30750..4f9110e 100644

  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
-@@ -347,11 +347,6 @@ CHECK_PCRE()
+@@ -392,11 +392,6 @@ CHECK_PCRE()

   CHECK_SYSTEMD()

--IF(CMAKE_CROSSCOMPILING)
+-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
  -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") -  INCLUDE(${IMPORT_EXECUTABLES})
  -ENDIF()

meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +0 -3
@@ -30,6 +23,3 @@ index fc30750..4f9110e 100644
    #
    # Setup maintainer mode options. Platform checks are
    # not run with the warning options as to not perturb fragile checks
---
-2.17.1
-

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 1ca86bcca..d082d424b 100644

meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +0 -0
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <[email protected]>
   +  __builtin_ppc_get_timebase();
    #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
      /* Mainly, prevent the compiler from optimizing away delay

loops */
-   __asm__ __volatile__ ("":::"memory");
+   __asm__ __volatile__ ("isb":::"memory");
  --- 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

meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +0 -0
similarity index 85%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
index e6743fe97..8ae8241b0 100644
@@ -2,7 +2,7 @@ require mariadb.inc
 

  EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"

-DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"
+DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2"

  PROVIDES += "mysql5 libmysqlclient"