CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: set pam module path to ${base_libdir}/security

Browse Source 
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.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2025-02-26 23:34:11 +08:00 committed by Khem Raj
parent 76025e2744
commit ba64200fd6
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/recipes-dbs/mysql/mariadb.inc
View File

@ -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} \