From ad4a71137e4a3e4e53bc0492a15ce1025f3f9143 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 25 Jul 2023 11:56:53 +0800 Subject: mariadb: Upgrade to 10.11.4 Rebase patch 0001-Add-missing-includes-cstdint-and-cstdio.patch to the new version. After the commit [1] introduced in the new version, there is below build failure though uca-dump installed as [2], so copy the uca-dump to the right place to fix the below failure. make[2]: *** No rule to make target 'strings/uca-dump', needed by 'strings/ctype-uca1400data.h'. Stop. [1] https://github.com/MariaDB/server/commit/6f6fa3bec2decb26598bce33d43594aabb25b201 [2] https://git.openembedded.org/meta-openembedded/commit/?id=1f69de300fd3b772830432eedeb2b055396494a6 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../recipes-dbs/mysql/mariadb-native_10.11.2.bb | 23 ------------ .../recipes-dbs/mysql/mariadb-native_10.11.4.bb | 23 ++++++++++++ meta-oe/recipes-dbs/mysql/mariadb.inc | 8 ++++- ...1-Add-missing-includes-cstdint-and-cstdio.patch | 41 +++++----------------- meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb | 26 -------------- meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb | 26 ++++++++++++++ 6 files changed, 64 insertions(+), 83 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb (limited to 'meta-oe/recipes-dbs') diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb deleted file mode 100644 index 578357b480..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.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-native_10.11.4.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb new file mode 100644 index 0000000000..578357b480 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.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.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 57930dae39..2fb0bd7be5 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc" +SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -110,6 +110,11 @@ OECMAKE_GENERATOR = "Unix Makefiles" ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" +do_compile:prepend:class-target () { + # remove the buildpath + sed -i -e "s:CMAKE_SYSROOT:CMAKE_SYSROOT_PLACE_HOLDER:g" ${S}/libmariadb/mariadb_config/mariadb_config.c.in +} + do_configure:append() { # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` @@ -140,6 +145,7 @@ do_compile:prepend:class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi + install -D ${RECIPE_SYSROOT_NATIVE}/usr/bin/uca-dump ${B}/strings/uca-dump } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 7c37fef493..12fbd75976 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -1,4 +1,4 @@ -From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 24 Jan 2023 21:40:43 -0800 Subject: [PATCH] Add missing includes and @@ -9,17 +9,16 @@ This is needed with GCC 13 and newer [1] Upstream-Status: Pending Signed-off-by: Khem Raj +Signed-off-by: Mingli Yu --- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - tpool/aio_linux.cc | 1 + - 6 files changed, 6 insertions(+) + 4 files changed, 4 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -index 963c1d8eb49..73487edd96d 100644 +index 963c1d8e..73487edd 100644 --- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h @@ -5,6 +5,7 @@ @@ -31,7 +30,7 @@ index 963c1d8eb49..73487edd96d 100644 struct CompactionIterationStats { diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index c7f93b4cfcd..3c2ab80535a 100644 +index c7f93b4c..3c2ab805 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -43,7 +42,7 @@ index c7f93b4cfcd..3c2ab80535a 100644 #include #include "rocksdb/status.h" diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h -index f356395f329..3215221755d 100644 +index f356395f..32152217 100644 --- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h @@ -5,6 +5,7 @@ @@ -55,7 +54,7 @@ index f356395f329..3215221755d 100644 #include diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 6db11cc947a..c26b6a21a57 100644 +index 6db11cc9..c26b6a21 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc @@ -8,6 +8,7 @@ @@ -66,30 +65,6 @@ index 6db11cc947a..c26b6a21a57 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" -diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index a761be66c52..064d059f08f 100644 ---- a/storage/rocksdb/rocksdb/util/string_util.h -+++ b/storage/rocksdb/rocksdb/util/string_util.h -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc -index 10234e0e46a..a6adf1af257 100644 ---- a/tpool/aio_linux.cc -+++ b/tpool/aio_linux.cc -@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ - - # include - # include -+# include - # include - # include - -- -2.39.1 +2.25.1 diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb deleted file mode 100644 index 87faabfa27..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -require mariadb.inc - -DEPENDS += "mariadb-native bison-native boost libpcre2 curl ncurses \ - zlib libaio libedit libevent libxml2 gnutls fmt lzo zstd" - -PROVIDES += "mysql5 libmysqlclient" - -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.4.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb new file mode 100644 index 0000000000..87faabfa27 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb @@ -0,0 +1,26 @@ +require mariadb.inc + +DEPENDS += "mariadb-native bison-native boost libpcre2 curl ncurses \ + zlib libaio libedit libevent libxml2 gnutls fmt lzo zstd" + +PROVIDES += "mysql5 libmysqlclient" + +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