Skip to contentSkip to conversation

mariadb: Upgrade to 10.11.4

PATCH New [email protected] 1 participant 1 message Jul 25, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mariadb: Upgrade to 10.11.4

From: Mingli Yu <[email protected]>

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

---
 ...e_10.11.2.bb => mariadb-native_10.11.4.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  8 +++-
 ...-missing-includes-cstdint-and-cstdio.patch | 41 ++++---------------
 ...{mariadb_10.11.2.bb => mariadb_10.11.4.bb} |  0
 4 files changed, 15 insertions(+), 34 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.2.bb => mariadb-native_10.11.4.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.2.bb => mariadb_10.11.4.bb} (100%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +7 -1
index 57930dae3..2fb0bd7be 100644
@@ -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"
meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +8 -33

80 lines not on this page · raw message

meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb
Signature · 1 line
2.25.1