From ef917bce9a0a6a1fb35de527327d9f6811af7a63 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 8 Jan 2025 20:40:07 -0800 Subject: 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 --- .../recipes-dbs/mysql/mariadb-native_10.11.10.bb | 23 ++++++++ .../recipes-dbs/mysql/mariadb-native_10.11.9.bb | 23 -------- meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- ...a-function-as-deleter-prototype-in-unique.patch | 26 --------- .../mysql/mariadb/ppc-remove-glibc-dep.patch | 43 --------------- meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb | 63 ++++++++++++++++++++++ meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb | 63 ---------------------- 7 files changed, 87 insertions(+), 158 deletions(-) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb 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 create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb (limited to 'meta-oe/recipes-dbs') diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb new file mode 100644 index 0000000000..578357b480 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb @@ -0,0 +1,23 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native \ +gnutls-native fmt-native \ +" + +RDEPENDS:${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ + install -m 0755 strings/uca-dump ${D}${bindir}/ +} + diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb deleted file mode 100644 index 578357b480..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native \ -gnutls-native fmt-native \ -" - -RDEPENDS:${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ - install -m 0755 strings/uca-dump ${D}${bindir}/ -} - 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.10.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb new file mode 100644 index 0000000000..b1d1355e2b --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.10.bb @@ -0,0 +1,63 @@ +require mariadb.inc + +inherit ptest +inherit useradd + +SRC_URI += "${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)}" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}" +RDEPENDS:${PN}-ptest += "cmake sed perl-module-test-more" + +do_install_ptest () { + rsync -a ${B}/unittest ${B}/dbug ${D}${PTEST_PATH} \ + --exclude CMakeFiles \ + --exclude cmake_install.cmake \ + --exclude Makefile \ + --exclude=*.a \ + --exclude=*.h \ + --exclude=*.o \ + --exclude=*.so \ + --exclude=*.d \ + --exclude=*.txt + install -m 0755 -d ${D}${PTEST_PATH}/storage + rsync -a ${B}/storage/maria ${B}/storage/perfschema ${B}/storage/innobase ${D}${PTEST_PATH}/storage \ + --exclude CMakeFiles \ + --exclude cmake_install.cmake \ + --exclude Makefile \ + --exclude=*.a \ + --exclude=*.h \ + --exclude=*.o \ + --exclude=*.so \ + --exclude=*.d \ + --exclude=*.txt + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` +} + +DEPENDS += "mariadb-native bison-native boost libpcre2 curl ncurses \ + zlib libaio libedit libevent libxml2 gnutls fmt lzo zstd" + +PROVIDES += "mysql5 libmysqlclient" + +USERADD_PACKAGES = "${PN}-setupdb" +USERADD_PARAM:${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" +GROUPADD_PARAM:${PN}-setupdb = "--system mysql" + +RPROVIDES:${PN} += "mysql5" +RREPLACES:${PN} += "mysql5" +RCONFLICTS:${PN} += "mysql5" + +RPROVIDES:${PN}-dbg += "mysql5-dbg" +RREPLACES:${PN}-dbg += "mysql5-dbg" +RCONFLICTS:${PN}-dbg += "mysql5-dbg" + +RPROVIDES:${PN}-leftovers += "mysql5-leftovers" +RREPLACES:${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS:${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES:${PN}-client += "mysql5-client" +RREPLACES:${PN}-client += "mysql5-client" +RCONFLICTS:${PN}-client += "mysql5-client" + +RPROVIDES:${PN}-server += "mysql5-server" +RREPLACES:${PN}-server += "mysql5-server" +RCONFLICTS:${PN}-server += "mysql5-server" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb deleted file mode 100644 index b1d1355e2b..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb +++ /dev/null @@ -1,63 +0,0 @@ -require mariadb.inc - -inherit ptest -inherit useradd - -SRC_URI += "${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)}" -DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}" -RDEPENDS:${PN}-ptest += "cmake sed perl-module-test-more" - -do_install_ptest () { - rsync -a ${B}/unittest ${B}/dbug ${D}${PTEST_PATH} \ - --exclude CMakeFiles \ - --exclude cmake_install.cmake \ - --exclude Makefile \ - --exclude=*.a \ - --exclude=*.h \ - --exclude=*.o \ - --exclude=*.so \ - --exclude=*.d \ - --exclude=*.txt - install -m 0755 -d ${D}${PTEST_PATH}/storage - rsync -a ${B}/storage/maria ${B}/storage/perfschema ${B}/storage/innobase ${D}${PTEST_PATH}/storage \ - --exclude CMakeFiles \ - --exclude cmake_install.cmake \ - --exclude Makefile \ - --exclude=*.a \ - --exclude=*.h \ - --exclude=*.o \ - --exclude=*.so \ - --exclude=*.d \ - --exclude=*.txt - cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} - sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` -} - -DEPENDS += "mariadb-native bison-native boost libpcre2 curl ncurses \ - zlib libaio libedit libevent libxml2 gnutls fmt lzo zstd" - -PROVIDES += "mysql5 libmysqlclient" - -USERADD_PACKAGES = "${PN}-setupdb" -USERADD_PARAM:${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM:${PN}-setupdb = "--system mysql" - -RPROVIDES:${PN} += "mysql5" -RREPLACES:${PN} += "mysql5" -RCONFLICTS:${PN} += "mysql5" - -RPROVIDES:${PN}-dbg += "mysql5-dbg" -RREPLACES:${PN}-dbg += "mysql5-dbg" -RCONFLICTS:${PN}-dbg += "mysql5-dbg" - -RPROVIDES:${PN}-leftovers += "mysql5-leftovers" -RREPLACES:${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS:${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES:${PN}-client += "mysql5-client" -RREPLACES:${PN}-client += "mysql5-client" -RCONFLICTS:${PN}-client += "mysql5-client" - -RPROVIDES:${PN}-server += "mysql5-server" -RREPLACES:${PN}-server += "mysql5-server" -RCONFLICTS:${PN}-server += "mysql5-server" -- cgit v1.2.3-54-g00ecf