From 91707923a298ec7c0507fbca1aa8ce03db50d93f Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Mon, 24 Sep 2012 14:34:51 +0800 Subject: policycoreutils: fix build with pam DISTRO_FEATURE If no pam DISTRO_FEATURE, policycoreutils should not build with libpam headers and libraries. Signed-off-by: Xin Ouyang --- recipes-security/selinux/policycoreutils_2.1.10.bb | 4 ++-- recipes-security/selinux/policycoreutils_git.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-security/selinux/policycoreutils_2.1.10.bb b/recipes-security/selinux/policycoreutils_2.1.10.bb index 848f010..10bc771 100644 --- a/recipes-security/selinux/policycoreutils_2.1.10.bb +++ b/recipes-security/selinux/policycoreutils_2.1.10.bb @@ -5,7 +5,7 @@ load_policy to load policies, setfiles to label filesystems, newrole \ to switch roles, and run_init to run /etc/init.d scripts in the proper \ context." SECTION = "base" -PR = "r1" +PR = "r2" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" @@ -47,7 +47,7 @@ FILES_${PN}-sandbox += "${sbindir}/seunshare" AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" -EXTRA_OEMAKE += "PAMH=${PAMH} AUDITH=${AUDITH} INOTIFYH=n" +EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" EXTRA_OEMAKE += "PREFIX=${D}" BBCLASSEXTEND = "native" diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb index d9c4608..d02c0d9 100644 --- a/recipes-security/selinux/policycoreutils_git.bb +++ b/recipes-security/selinux/policycoreutils_git.bb @@ -5,7 +5,7 @@ load_policy to load policies, setfiles to label filesystems, newrole \ to switch roles, and run_init to run /etc/init.d scripts in the proper \ context." SECTION = "base" -PR = "r1" +PR = "r2" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEFAULT_PREFERENCE = "-1" @@ -48,7 +48,7 @@ FILES_${PN}-sandbox += "${sbindir}/seunshare" AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" -EXTRA_OEMAKE += "PAMH=${PAMH} AUDITH=${AUDITH} INOTIFYH=n" +EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" EXTRA_OEMAKE += "PREFIX=${D}" BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf