From 6079c073b691e514186a43dfe50c6cf874d94dd7 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Sat, 19 Jan 2013 15:18:38 +0800 Subject: policycoreutils: inherit selinux Signed-off-by: Xin Ouyang --- recipes-security/selinux/policycoreutils.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc index e105db2..cc54b36 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils.inc @@ -1,4 +1,4 @@ -PRINC = "1" +PRINC = "2" SUMMARY = "SELinux policy core utilities" DESCRIPTION = "policycoreutils contains the policy core utilities that are required \ @@ -16,9 +16,9 @@ PAM_SRC_URI = "file://pam.d/newrole \ " DEPENDS += "libsepol libselinux libsemanage" -DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" -EXTRA_DEPENDS = "libcap-ng libcgroup" -EXTRA_DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" + +inherit selinux +DEPENDS += "${@target_selinux(d, 'libcap-ng libcgroup libpam audit')}" RDEPENDS_${BPN} += "\ libselinux-python \ @@ -51,7 +51,7 @@ inherit pythonnative 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 += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" +EXTRA_OEMAKE += "${@target_selinux(d, 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ')} INOTIFYH=n" EXTRA_OEMAKE += "PREFIX=${D}" EXTRA_OEMAKE += "INITDIR=${D}/etc/init.d" -- cgit v1.2.3-54-g00ecf