From e2140c416c517fef743ef2b34435eda65f7f1533 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 6 Jan 2025 16:21:52 +0800 Subject: [PATCH] zfs: enable packageconfig pam for pam distro feature Enable pam packageconfig if pam is in DISTRO_FEATURES. Also set pam module path to ${base_libdir}/security as this is the default path in libpam. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb index 1b41deb099..b24774311d 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb @@ -20,9 +20,11 @@ inherit module-base pkgconfig autotools bash-completion DEPENDS = "virtual/kernel zlib util-linux libtirpc openssl curl" -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ + " -PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${libdir}/security, --disable-pam" +PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${base_libdir}/security, --disable-pam" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd," PACKAGECONFIG[sysvinit] = "--enable-sysvinit,--disable-sysvinit," @@ -69,6 +71,8 @@ FILES:${PN} += "\ ${bindir} \ ${libexecdir}/${BPN} \ ${libdir} \ + ${datadir}/pam-configs \ + ${base_libdir}/security \ " FILES:${PN}-dev += "\