diff mbox series

[meta-oe] mariadb: Upgrade 11.4.8 -> 11.4.9

Message ID 20251124093545.3217845-1-mingli.yu@windriver.com
State Under Review
Headers show
Series [meta-oe] mariadb: Upgrade 11.4.8 -> 11.4.9 | expand

Commit Message

Yu, Mingli Nov. 24, 2025, 9:35 a.m. UTC 
From: Mingli Yu <mingli.yu@windriver.com>

Remove the 0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
patch as its logic included in new version [1].

Release notes: https://mariadb.com/docs/release-notes/community-server/11.4/11.4.9

[1] https://github.com/MariaDB/server/commit/e8026a50197cbfccd70a2072cbc0ae4728a4ab40

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 ...ive_11.4.8.bb => mariadb-native_11.4.9.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  3 +-
 ...lity-with-ARMv9-by-updating-.arch-di.patch | 41 -------------------
 .../{mariadb_11.4.8.bb => mariadb_11.4.9.bb}  |  0
 4 files changed, 1 insertion(+), 43 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_11.4.8.bb => mariadb-native_11.4.9.bb} (100%)
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb_11.4.8.bb => mariadb_11.4.9.bb} (100%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 82479c248f..4fcb5a1e40 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -22,14 +22,13 @@  SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://lfs64.patch \
            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
-           file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \
            file://riscv32.patch \
            file://0001-Remove-x86-specific-loop-in-my_convert.patch \
            file://0001-support-reproducible-builds.patch \
            file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \
            file://0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch \
           "
-SRC_URI[sha256sum] = "52fa4dca2c5f80afc1667d523a27c06176d98532298a6b0c31ed73505f49e15c"
+SRC_URI[sha256sum] = "8e481ca29b5a740444d45451c8ea2d93711cf525d6fa5d27bc9512cf8973b075"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
deleted file mode 100644
index 2a1c74a68c..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From 0b1ba174bd5148c0675b335fcebde767a56e10bb Mon Sep 17 00:00:00 2001
-From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
-Date: Mon, 2 Dec 2024 02:18:46 +0000
-Subject: [PATCH] Ensure compatibility with ARMv9 by updating .arch directive
-
-The pmem_cvap() function currently uses the '.arch armv8.2-a' directive
-for the 'dc cvap' instruction. This will cause build errors below when
-compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a'
-to ensure compatibility with ARMv9 architectures.
-
-{standard input}: Assembler messages:
-{standard input}:169: Error: selected processor does not support `retaa'
-{standard input}:286: Error: selected processor does not support `retaa'
-make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make:
-1644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o]
-Error 1
-
-Upstream-Status: Submitted
-
-Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
----
- storage/innobase/sync/cache.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/storage/innobase/sync/cache.cc b/storage/innobase/sync/cache.cc
-index 43d642d0..c5e67709 100644
---- a/storage/innobase/sync/cache.cc
-+++ b/storage/innobase/sync/cache.cc
-@@ -82,7 +82,12 @@ static void pmem_cvap(const void* buf, size_t size)
-   for (uintptr_t u= uintptr_t(buf) & ~(CPU_LEVEL1_DCACHE_LINESIZE),
-          end= uintptr_t(buf) + size;
-        u < end; u+= CPU_LEVEL1_DCACHE_LINESIZE)
-+#if defined __ARM_ARCH && __ARM_ARCH == 9
-+    __asm__ __volatile__(".arch armv9.4-a\n dc cvap, %0" :: "r"(u) : "memory");
-+#else
-     __asm__ __volatile__(".arch armv8.2-a\n dc cvap, %0" :: "r"(u) : "memory");
-+#endif
-+
-   __asm__ __volatile__("dmb ishst" ::: "memory");
- }
- 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb