Hi, Khem
I have backport your upgrade patch, but still have a build error as following:
-----------------------------------
CMake Error at CMakeLists.txt:397 (INCLUDE):
INCLUDE could not find requested file:
IMPORTFILE-NOTFOUND
-----------------------------------
So, I think " fix-a-building-failure.patch " is still necessary, but need to be
updated to :
-----------------------------------
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cec9cd7e..d090d3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,11 +392,6 @@ CHECK_PCRE()
CHECK_SYSTEMD()
-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()
-
#
# Setup maintainer mode options. Platform checks are
# not run with the warning options as to not perturb fragile checks
--
2.25.1
-----------------------------------
Best regards
Lei
> -----Original Message-----
> From: [email protected]
> <[email protected]> On Behalf Of Khem Raj
> Sent: Saturday, May 8, 2021 10:39 PM
> To: [email protected]
> Cc: Khem Raj <[email protected]>
> Subject: [oe] [meta-oe][PATCH] mariadb: Upgrade to 10.5.10
>
> Drop fix-a-building-failure.patch because upstream has made is narrower to
> apply to emulator builds and not just any cross compiling builds
>
> Signed-off-by: Khem Raj <[email protected]>
> ---
> ...ve_10.5.9.bb => mariadb-native_10.5.10.bb} | 0
> meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +-
> .../mariadb/fix-a-building-failure.patch | 35 -------------------
> .../mysql/mariadb/ppc-remove-glibc-dep.patch | 2
> +- .../{mariadb_10.5.9.bb => mariadb_10.5.10.bb} | 0
> 5 files changed, 2 insertions(+), 38 deletions(-) rename
> meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.9.bb =>
> mariadb-native_10.5.10.bb} (100%) delete mode 100644
> meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
> rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.9.bb =>
> mariadb_10.5.10.bb} (100%)
>
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb
> b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb
> 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
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc
> b/meta-oe/recipes-dbs/mysql/mariadb.inc
> index 9833b28857..50cf5ed236 100644
> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc
> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
> @@ -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 \ @@ -25,7 +24,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] =
> "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/fix-a-building-failure.patch
> deleted file mode 100644
> index 9149ee21f2..0000000000
> --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -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]
> -
> -building failed since native does not generate import_executables.cmake -In
> fact, our building system will export the needed commands
> -
> -Signed-off-by: Roy Li <[email protected]>
> -Signed-off-by: Mingli Yu <[email protected]>
> ----
> - CMakeLists.txt | 5 -----
> - 1 file changed, 5 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc30750..4f9110e 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -347,11 +347,6 @@ CHECK_PCRE()
> -
> - CHECK_SYSTEMD()
> -
> --IF(CMAKE_CROSSCOMPILING)
> -- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH
> "Path to import_executables.cmake from a native build")
> -- INCLUDE(${IMPORT_EXECUTABLES})
> --ENDIF()
> --
> - #
> - # 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 1ca86bcca2..d082d424b0 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 <[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 diff --git
> a/meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
> b/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb
> --
> 2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91232):
https://lists.openembedded.org/g/openembedded-devel/message/91232
Mute This Topic: https://lists.openembedded.org/mt/82679052/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
