From d0f889259b610c3365962775c6e96a7cba407177 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Thu, 7 Jul 2016 10:38:32 -0400 Subject: 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 --- recipes-security/packagegroups/packagegroup-core-selinux.bb | 2 +- recipes-security/packagegroups/packagegroup-selinux-minimal.bb | 2 +- recipes-security/refpolicy/refpolicy_common.inc | 2 +- 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} = " \ selinux-autorelabel \ selinux-init \ selinux-labeldev \ - virtual/refpolicy \ + refpolicy \ coreutils \ " 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} = "\ policycoreutils-sestatus \ policycoreutils-setfiles \ selinux-labeldev \ - virtual/refpolicy \ + refpolicy \ " 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" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" PROVIDES += "virtual/refpolicy" -RPROVIDES_${PN} += "virtual/refpolicy" +RPROVIDES_${PN} += "refpolicy" # Specific config files for Poky SRC_URI += "file://customizable_types \ -- cgit v1.2.3-54-g00ecf