aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2021-01-29 07:37:46 -0600
committerArmin Kuster <akuster808@gmail.com>2021-01-29 21:10:07 -0800
commit74c1298dfcc697859f210ba50a6a72fbbc897704 (patch)
tree418a0cf58a4a5a2889dc3da316a12cc0c12bb64f
parentf9f3bacac75a7aaebfb5de89adfb4c9f640bb03f (diff)
downloadmeta-openembedded-contrib-74c1298dfcc697859f210ba50a6a72fbbc897704.tar.gz
meta-openembedded-contrib-74c1298dfcc697859f210ba50a6a72fbbc897704.tar.bz2
meta-openembedded-contrib-74c1298dfcc697859f210ba50a6a72fbbc897704.zip
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 <dmurphy@ti.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc8
1 files 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
}