diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2020-07-28 01:36:03 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-07-28 12:55:35 -0700 |
| commit | 8fa0a3ace6b8835ba623fac118e0bdb4ea0f1f24 (patch) | |
| tree | 9fab64a9585e840645bdeeb0b671e20783021b37 /meta-oe/recipes-dbs/mysql/mariadb.inc | |
| parent | 4a1e05154f534a485975529f331b00d0e259911c (diff) | |
| download | meta-openembedded-8fa0a3ace6b8835ba623fac118e0bdb4ea0f1f24.tar.gz | |
mariadb: upgrade to 10.5.4
* Remove one backported patch
* Remove SRC_URI[md5sum]
* Rebase two patches to fix fuzz warnings
* Add curl depends to fix below error:
| ./mariadb-10.5.4/storage/maria/libmarias3/libmarias3/marias3.h:26:10: fatal error: curl/curl.h: No such file or directory
* update the pam_user_map.so install logic as below commit introduced in this new
mariadb version
236aed3f5f0 MDEV-21656: Wrong directory for pam_user_map.so JIRA:https://jira.mariadb.org/browse/MDEV-17292
* Backport a patch to fix the undefined reference to `crc32c_arm64' on arm64
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 95f5acba1f..58f573e5e3 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,11 +18,10 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ - file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ file://0001-Fix-library-LZ4-lookup.patch \ + file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \ " -SRC_URI[md5sum] = "97d7c0f508c04a31c138fdb24e95dbc4" -SRC_URI[sha256sum] = "fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208" +SRC_URI[sha256sum] = "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -169,8 +168,12 @@ do_install() { mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - mv ${D}/lib/security ${D}/${libdir} - rmdir --ignore-fail-on-non-empty ${D}/lib + pam_so=$(find ${D} -name pam_user_map.so) + if [ x"${pam_so}" != x ]; then + pam_dir=$(dirname ${pam_so}) + mv ${pam_dir} ${D}/${libdir} + rmdir --ignore-fail-on-non-empty ${pam_dir%security} + fi fi } |