From 1f69de300fd3b772830432eedeb2b055396494a6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 13 Dec 2022 19:00:09 -0800 Subject: [PATCH] mariadb: Upgrade to 10.11.1 Install uca-dump in native case, which is needed by target mariadb build Signed-off-by: Khem Raj --- .../{mariadb-native_10.8.3.bb => mariadb-native_10.11.1.bb} | 1 + meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +-- .../mysql/{mariadb_10.8.3.bb => mariadb_10.11.1.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.8.3.bb => mariadb-native_10.11.1.bb} (90%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.8.3.bb => mariadb_10.11.1.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb similarity index 90% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb index 17a06349b0..578357b480 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb @@ -18,5 +18,6 @@ do_install() { 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 2ef0d1aa3b..1a7cce2ea1 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,8 +23,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" - -SRC_URI[sha256sum] = "887eadc55176ac1ead1fccfc89ade4b5990ef192745ad4dcd879acb41c050892" +SRC_URI[sha256sum] = "ffacf84e74daf249ad64b9573d79a4e882f66b004614f8b33bfcb14a8e25da1d" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb