diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2013-01-19 15:18:38 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2013-01-22 14:43:13 +0800 |
commit | 6079c073b691e514186a43dfe50c6cf874d94dd7 (patch) | |
tree | a18a62fd691f6e53ff445b7c4168b7c8b3190505 | |
parent | 2632759938613f8173ae511bf99dccf14d23ed8d (diff) | |
download | meta-selinux-6079c073b691e514186a43dfe50c6cf874d94dd7.tar.gz |
policycoreutils: inherit selinux
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-rw-r--r-- | recipes-security/selinux/policycoreutils.inc | 10 |
1 files 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 @@ | |||
1 | PRINC = "1" | 1 | PRINC = "2" |
2 | 2 | ||
3 | SUMMARY = "SELinux policy core utilities" | 3 | SUMMARY = "SELinux policy core utilities" |
4 | DESCRIPTION = "policycoreutils contains the policy core utilities that are required \ | 4 | DESCRIPTION = "policycoreutils contains the policy core utilities that are required \ |
@@ -16,9 +16,9 @@ PAM_SRC_URI = "file://pam.d/newrole \ | |||
16 | " | 16 | " |
17 | 17 | ||
18 | DEPENDS += "libsepol libselinux libsemanage" | 18 | DEPENDS += "libsepol libselinux libsemanage" |
19 | DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" | 19 | |
20 | EXTRA_DEPENDS = "libcap-ng libcgroup" | 20 | inherit selinux |
21 | EXTRA_DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" | 21 | DEPENDS += "${@target_selinux(d, 'libcap-ng libcgroup libpam audit')}" |
22 | 22 | ||
23 | RDEPENDS_${BPN} += "\ | 23 | RDEPENDS_${BPN} += "\ |
24 | libselinux-python \ | 24 | libselinux-python \ |
@@ -51,7 +51,7 @@ inherit pythonnative | |||
51 | 51 | ||
52 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" | 52 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" |
53 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" | 53 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" |
54 | EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" | 54 | EXTRA_OEMAKE += "${@target_selinux(d, 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ')} INOTIFYH=n" |
55 | EXTRA_OEMAKE += "PREFIX=${D}" | 55 | EXTRA_OEMAKE += "PREFIX=${D}" |
56 | EXTRA_OEMAKE += "INITDIR=${D}/etc/init.d" | 56 | EXTRA_OEMAKE += "INITDIR=${D}/etc/init.d" |
57 | 57 | ||