diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2016-07-07 10:38:32 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-07-07 10:38:32 -0400 |
commit | d0f889259b610c3365962775c6e96a7cba407177 (patch) | |
tree | b3dcae837498bac00736ca28bc37c0ad3282e329 | |
parent | 655db117a2f8a6f6d925d8c9f278354710f86df3 (diff) | |
download | meta-selinux-d0f889259b610c3365962775c6e96a7cba407177.tar.gz |
refpolicy: remove virtual prefix for runtime providers
In keeping with the approach of only providing a single default policy at
runtime, we were originally using a virtual/refpolicy dependency and
filling it with one of our specific refpolicy implementations. This works
well enough for some package systems, but fails for others (specifically
deb, possibly more).
Since the intent was to only have one present in the default image anyway,
we'll just throw out the 'virtual/' part of the RPROVIDES and related
dependencies across the board.
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-security/packagegroups/packagegroup-core-selinux.bb b/recipes-security/packagegroups/packagegroup-core-selinux.bb index c6d22b7..9c74458 100644 --- a/recipes-security/packagegroups/packagegroup-core-selinux.bb +++ b/recipes-security/packagegroups/packagegroup-core-selinux.bb | |||
@@ -25,6 +25,6 @@ RDEPENDS_${PN} = " \ | |||
25 | selinux-autorelabel \ | 25 | selinux-autorelabel \ |
26 | selinux-init \ | 26 | selinux-init \ |
27 | selinux-labeldev \ | 27 | selinux-labeldev \ |
28 | virtual/refpolicy \ | 28 | refpolicy \ |
29 | coreutils \ | 29 | coreutils \ |
30 | " | 30 | " |
diff --git a/recipes-security/packagegroups/packagegroup-selinux-minimal.bb b/recipes-security/packagegroups/packagegroup-selinux-minimal.bb index 451ae8b..eac4b94 100644 --- a/recipes-security/packagegroups/packagegroup-selinux-minimal.bb +++ b/recipes-security/packagegroups/packagegroup-selinux-minimal.bb | |||
@@ -22,5 +22,5 @@ RDEPENDS_${PN} = "\ | |||
22 | policycoreutils-sestatus \ | 22 | policycoreutils-sestatus \ |
23 | policycoreutils-setfiles \ | 23 | policycoreutils-setfiles \ |
24 | selinux-labeldev \ | 24 | selinux-labeldev \ |
25 | virtual/refpolicy \ | 25 | refpolicy \ |
26 | " | 26 | " |
diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc index 1d3b93f..e1eac50 100644 --- a/recipes-security/refpolicy/refpolicy_common.inc +++ b/recipes-security/refpolicy/refpolicy_common.inc | |||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2" | |||
6 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" | 6 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" |
7 | 7 | ||
8 | PROVIDES += "virtual/refpolicy" | 8 | PROVIDES += "virtual/refpolicy" |
9 | RPROVIDES_${PN} += "virtual/refpolicy" | 9 | RPROVIDES_${PN} += "refpolicy" |
10 | 10 | ||
11 | # Specific config files for Poky | 11 | # Specific config files for Poky |
12 | SRC_URI += "file://customizable_types \ | 12 | SRC_URI += "file://customizable_types \ |