From 74c1298dfcc697859f210ba50a6a72fbbc897704 Mon Sep 17 00:00:00 2001 From: Dan Murphy Date: Fri, 29 Jan 2021 07:37:46 -0600 Subject: mariadb: Fix 64bit builds if pam is enabled Fix the installation of the pam.so for 64bit builds. This is an indirect backport of commit 8fa0a3ace6b8835ba623fac118e0bdb4ea0f1f24 ("mariadb: upgrade to 10.5.4") from the master branch. Signed-off-by: Dan Murphy Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 1a86bc0446..9f7203c40d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -167,8 +167,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 } -- cgit 1.2.3-korg