From ff119e949e26d3365a76d86a2ebec1d0b4a34a5d Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 6 Jan 2025 16:21:49 +0800
Subject: mariadb: set pam module path to ${base_libdir}/security

Set pam module path to ${base_libdir}/security as this is the default
path in libpam.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'meta-oe/recipes-dbs')

diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index f3b8b5eed4..d3192cc59c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -192,7 +192,7 @@ do_install() {
         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}
+            mv ${pam_dir} ${D}/${base_libdir}
             rmdir --ignore-fail-on-non-empty ${pam_dir%security}
         fi
     fi
@@ -346,7 +346,7 @@ FILES:${PN}-server = "\
     ${sbindir}/mysqld \
     ${sbindir}/mariadbd \
     ${libdir}/plugin/*.so \
-    ${libdir}/security/*.so \
+    ${base_libdir}/security/*.so \
     ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \
     ${datadir}/mysql/ \
     ${localstatedir}/mysql/ \
-- 
cgit v1.2.3-54-g00ecf