Skip to contentSkip to conversation

mariadb: Upgrade to 10.11.9 release

PATCH New Khem Raj 1 participant 1 message Aug 29, 2024

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 mariadb: Upgrade to 10.11.9 release

Drop upstreamed patches
Fixes build with fmt11

---
 ...e_10.11.7.bb => mariadb-native_10.11.9.bb} |   0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |   4 +-
 ...EV-33439-Fix-build-with-libxml2-2.12.patch | 170 ------------------
 ...Remove-the-compile_time_assert-lines.patch |  43 -----
 ...{mariadb_10.11.7.bb => mariadb_10.11.9.bb} |   0
 5 files changed, 1 insertion(+), 216 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.7.bb => mariadb-native_10.11.9.bb} (100%)
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.7.bb => mariadb_10.11.9.bb} (100%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +1 -3
index 32a6022bab..ae6581ec71 100644
@@ -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-Remove-the-compile_time_assert-lines.patch \
-           file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \
           "
 SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
-SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
+SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
 
meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch deleted +0 -170

170 lines not on this page · raw message

meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch deleted +0 -43

43 lines not on this page · raw message

meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb