mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
cri-o: use PACKAGECONFIG to handle selinux
For cri-o, libselinux is optional, this can be seen from its Makefile. So let's make selinux optional by using PACKAGECONFIG, whose default value is determined by the DISTRO_FEATURES. In this way, meta-selinux dependency is not necessary. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
parent
08fb12bbcc
commit
253cf1d572
|
@ -39,14 +39,14 @@ DEPENDS = " \
|
||||||
ostree \
|
ostree \
|
||||||
libdevmapper \
|
libdevmapper \
|
||||||
libseccomp \
|
libseccomp \
|
||||||
libselinux \
|
|
||||||
"
|
"
|
||||||
RDEPENDS:${PN} = " \
|
RDEPENDS:${PN} = " \
|
||||||
cni \
|
cni \
|
||||||
libdevmapper \
|
libdevmapper \
|
||||||
"
|
"
|
||||||
|
|
||||||
SKIP_RECIPE[cri-o] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'selinux', '', 'Depends on libselinux from meta-selinux which is not included', d)}"
|
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
|
||||||
|
PACKAGECONFIG[selinux] = ",,libselinux"
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-config"
|
PACKAGES =+ "${PN}-config"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user