From 6c68c22d7321f5135ea9ab07f768557e1e191cd5 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 16 Aug 2023 13:57:11 +0800 Subject: [PATCH] mariadb: Upgrade to 10.11.5 Adjust the cmake option to disable pam auth module Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../{mariadb-native_10.11.4.bb => mariadb-native_10.11.5.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++-- .../mysql/{mariadb_10.11.4.bb => mariadb_10.11.5.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.4.bb => mariadb-native_10.11.5.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.4.bb => mariadb_10.11.5.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 2fb0bd7be5..ee3fe0a328 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -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] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" +SRC_URI[sha256sum] = "4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -67,7 +67,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} lz4 openssl" EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" PACKAGECONFIG:class-native = "" -PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" +PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES,-DPLUGIN_AUTH_PAM=NO,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[lz4] = ", ,lz4" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb