Skip to contentSkip to conversation

mariadb: Upgrade to 10.8.3

PATCH New [email protected] 1 participant 1 message Jul 4, 2022 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH v2 1/1 mariadb: Upgrade to 10.8.3

In reply to a message not in the archive

From: Mingli Yu <[email protected]>

Remove the backported patch mariadb-openssl3.patch as the logic is included in the new version.

Add zstd to DEPENDS as below commit [1] introduced.
770cf22 CONC-575: Support for MySQL zstd compression

[1] https://github.com/mariadb-corporation/mariadb-connector-c/commit/770cf2286ab4819ae698356541d4fa14578f3ca6

---
 ...ive_10.7.4.bb => mariadb-native_10.8.3.bb} |   0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  11 +-
 .../mysql/mariadb/mariadb-openssl3.patch      | 416 ------------------
 .../{mariadb_10.7.4.bb => mariadb_10.8.3.bb}  |   2 +-
 4 files changed, 9 insertions(+), 420 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.7.4.bb => mariadb-native_10.8.3.bb} (100%)
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.7.4.bb => mariadb_10.8.3.bb} (91%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +8 -3
index 922373b63..fa32e6844 100644
@@ -19,11 +19,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://ssize_t.patch \
            file://mm_malloc.patch \
            file://sys_futex.patch \
-           file://mariadb-openssl3.patch \
           "
 SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
 
-SRC_URI[sha256sum] = "73dd9c9d325520f20ca5e0ef16f94b7be1146bed7e4a78e735c20daebf3a4173"
+SRC_URI[sha256sum] = "887eadc55176ac1ead1fccfc89ade4b5990ef192745ad4dcd879acb41c050892"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
@@ -66,7 +65,6 @@ PACKAGECONFIG:class-native = ""
 PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam"
 PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
 PACKAGECONFIG[krb5] = ", ,krb5"
-PACKAGECONFIG[zstd] = "-DWITH_ROCKSDB_ZSTD=ON,-DWITH_ROCKSDB_ZSTD=OFF,zstd"
 PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl"
 
 # MariaDB doesn't link properly with gold
@@ -176,6 +174,13 @@ do_install() {
     if [ -f ${D}${datadir}/doc/README ]; then
         mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/
     fi
+
+    # mini-benchmark used for Gitlab-CI to run on every commit to catch
+    # if there are severe performance regressions.
+    # remove it to avoid introducing bash dependency
+    if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then
+        rm -rf ${D}${datadir}/mysql/mini-benchmark
+    fi
     if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
         pam_so=$(find ${D} -name pam_user_map.so)
         if [ x"${pam_so}" != x ]; then
meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch deleted +0 -416

416 lines not on this page · raw message

meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb +1 -1
similarity index 91%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb
index c800c4c56..20bb5fc1f 100644
@@ -3,7 +3,7 @@ require mariadb.inc
 inherit qemu
 
 DEPENDS += "qemu-native bison-native boost libpcre2 curl ncurses \
-            zlib libaio libedit libevent libxml2 gnutls fmt lzo"
+            zlib libaio libedit libevent libxml2 gnutls fmt lzo zstd"
 
 PROVIDES += "mysql5 libmysqlclient"
 
Signature · 1 line
2.25.1