diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2017-09-08 10:44:23 -0500 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2017-09-14 08:29:01 -0500 |
commit | 4fefe83c3203c11fadbe43637a3058284b60427b (patch) | |
tree | af4b33f05100c12ed16851f5dd4129f0e176da25 /recipes-extended/shadow | |
parent | 694b8d1f1a590083e4445d6941f24b412ec0f206 (diff) | |
download | meta-selinux-4fefe83c3203c11fadbe43637a3058284b60427b.tar.gz |
Refactor to conform to YP Compat requirements
Change the references to check for the distribution flag of 'selinux' being
set before taking any action within the bbappends. This prevents the
signature from being modified.
Also remove PR changes, as they are no longer allowed.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'recipes-extended/shadow')
-rw-r--r-- | recipes-extended/shadow/shadow_%.bbappend | 8 | ||||
-rw-r--r-- | recipes-extended/shadow/shadow_selinux.inc | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/recipes-extended/shadow/shadow_%.bbappend b/recipes-extended/shadow/shadow_%.bbappend index b7ccf40..7719d3b 100644 --- a/recipes-extended/shadow/shadow_%.bbappend +++ b/recipes-extended/shadow/shadow_%.bbappend | |||
@@ -1,7 +1 @@ | |||
1 | PR .= ".1" | require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} | |
2 | |||
3 | inherit with-selinux with-audit | ||
4 | |||
5 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage," | ||
6 | |||
7 | FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}" | ||
diff --git a/recipes-extended/shadow/shadow_selinux.inc b/recipes-extended/shadow/shadow_selinux.inc new file mode 100644 index 0000000..496ea6a --- /dev/null +++ b/recipes-extended/shadow/shadow_selinux.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | inherit with-selinux with-audit | ||
4 | |||
5 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage," | ||
6 | |||