From ef917bce9a0a6a1fb35de527327d9f6811af7a63 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 8 Jan 2025 20:40:07 -0800 Subject: [PATCH] mariadb: Upgrade to 10.11.10 Drop 0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch its already in this version Drop ppc musl patch, a check for glibc is already added in this version Signed-off-by: Khem Raj --- ..._10.11.9.bb => mariadb-native_10.11.10.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- ...ction-as-deleter-prototype-in-unique.patch | 26 ----------- .../mysql/mariadb/ppc-remove-glibc-dep.patch | 43 ------------------- ...mariadb_10.11.9.bb => mariadb_10.11.10.bb} | 0 5 files changed, 1 insertion(+), 72 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.9.bb => mariadb-native_10.11.10.bb} (100%) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.9.bb => mariadb_10.11.10.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index d3192cc59c..ae782e78af 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,11 +23,9 @@ 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-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ " -SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" +SRC_URI[sha256sum] = "b06a74650b83a16aa9ab098984482b028e75b000674b11ff288772c619a6f022" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch deleted file mode 100644 index 416b17ba23..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 713c21880e25108bf0703433432acca58377cc7b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 27 Sep 2024 11:55:53 -0700 -Subject: [PATCH] Use a lambda function as deleter prototype in unique_ptr - -Fixes build with clang/libc++ 20+ - -Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-35040] -Signed-off-by: Khem Raj ---- - extra/mariabackup/backup_copy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc -index a328f5e0ec7..2ab04b78bce 100644 ---- a/extra/mariabackup/backup_copy.cc -+++ b/extra/mariabackup/backup_copy.cc -@@ -1641,7 +1641,7 @@ is_aria_log_dir_file(const datadir_node_t &node) - bool - copy_back_aria_logs(const char *dstdir) - { -- std::unique_ptr -+ std::unique_ptr> - ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy); - - datadir_node_t node; 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 deleted file mode 100644 index 3787b74ad1..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Pending - -Remove glibc specific function dependencies - -Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch -Signed-off-by: Khem Raj - -diff --git a/include/my_cpu.h b/include/my_cpu.h -index f2e26fca..94599b74 100644 ---- a/include/my_cpu.h -+++ b/include/my_cpu.h -@@ -24,17 +24,16 @@ - */ - - #ifdef _ARCH_PWR8 --#include - /* Very low priority */ --#define HMT_very_low() __ppc_set_ppr_very_low() -+#define HMT_very_low() asm volatile("or 31,31,31") - /* Low priority */ --#define HMT_low() __ppc_set_ppr_low() -+#define HMT_low() asm volatile ("or 1,1,1") - /* Medium low priority */ --#define HMT_medium_low() __ppc_set_ppr_med_low() -+#define HMT_medium_low() asm volatile ("or 6,6,6") - /* Medium priority */ --#define HMT_medium() __ppc_set_ppr_med() -+#define HMT_medium() asm volatile ("or 2,2,2") - /* Medium high priority */ --#define HMT_medium_high() __ppc_set_ppr_med_high() -+#define HMT_medium_high() asm volatile("or 5,5,5") - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") - #else -@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -- __ppc_get_timebase(); -+ __builtin_ppc_get_timebase(); - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) - /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("":::"memory"); diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb