From 253cf1d57239bf7e8cdea7797ddcc5e9e87c8e85 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 17 Feb 2023 07:28:11 -0800 Subject: 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 Signed-off-by: Bruce Ashfield --- recipes-containers/cri-o/cri-o_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 1106cd56..5895274a 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -39,14 +39,14 @@ DEPENDS = " \ ostree \ libdevmapper \ libseccomp \ - libselinux \ " RDEPENDS:${PN} = " \ cni \ 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" -- cgit v1.2.3-54-g00ecf