Set pam module path to ${base_libdir}/security via INSTALL_PAMDIR. Then
we can get rid of the workaround in do_install.
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
meta-oe/recipes-dbs/mysql/mariadb.inc | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc
b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 51eaf4a502..5524305952 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -63,7 +63,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] = "-DPLUGIN_AUTH_PAM=YES,-DPLUGIN_AUTH_PAM=NO,libpam"
+PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES
-DINSTALL_PAMDIR=${base_libdir}/security,-DPLUGIN_AUTH_PAM=NO,libpam"
PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
PACKAGECONFIG[krb5] = ", ,krb5"
PACKAGECONFIG[lz4] = ", ,lz4"
@@ -182,14 +182,6 @@ do_install() {
if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then
rm -rf ${D}${datadir}/mariadb/mini-benchmark
fi
- if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)};
then
- pam_so=$(find ${D} -name pam_user_map.so)
- if [ x"${pam_so}" != x ]; then
- pam_dir=$(dirname ${pam_so})
- mv ${pam_dir} ${D}/${base_libdir}
- rmdir --ignore-fail-on-non-empty ${pam_dir%security}
- fi
- fi
}
PACKAGES = "${PN}-dbg ${PN}-setupdb ${PN} \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115651):
https://lists.openembedded.org/g/openembedded-devel/message/115651
Mute This Topic: https://lists.openembedded.org/mt/111397778/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
