From 1f69de300fd3b772830432eedeb2b055396494a6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 13 Dec 2022 19:00:09 -0800
Subject: mariadb: Upgrade to 10.11.1

Install uca-dump in native case, which is needed by target mariadb build

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-dbs/mysql/mariadb-native_10.11.1.bb    | 23 +++++++++++++++++++
 meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb | 22 ------------------
 meta-oe/recipes-dbs/mysql/mariadb.inc              |  3 +--
 meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb       | 26 ++++++++++++++++++++++
 meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb        | 26 ----------------------
 5 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb
 create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb

(limited to 'meta-oe/recipes-dbs')

diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb
new file mode 100644
index 0000000000..578357b480
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.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.8.3.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb
deleted file mode 100644
index 17a06349b0..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb
+++ /dev/null
@@ -1,22 +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}/
-}
-
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.11.1.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb
new file mode 100644
index 0000000000..87faabfa27
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.1.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"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb
deleted file mode 100644
index 87faabfa27..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.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"
-- 
cgit v1.2.3-54-g00ecf