From a7b828851181b263466a2a8cbd7ba9caf9d6e28e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 26 Aug 2021 14:43:33 +0200 Subject: [PATCH] images: include packagegroup-core-selinux if "selinux" is in DISTRO_FEATURES This packagegroup includes all of the userspace packages needed to use SELinux. For now, use the same variant of the packagegroup, which contains all available packages. Since the meta-selinux layer isn't available in all platforms, implement this change via a dynamic layer. https://onedigi.atlassian.net/browse/DEL-7641 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/layer.conf | 2 ++ .../selinux/recipes-core/images/dey-image-aws.bbappend | 1 + .../selinux/recipes-core/images/dey-image-qt.bbappend | 1 + .../selinux/recipes-core/images/dey-image-webkit.bbappend | 1 + .../dynamic-layers/selinux/recipes-core/images/selinux_dey.inc | 1 + 5 files changed, 6 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-aws.bbappend create mode 100644 meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-qt.bbappend create mode 100644 meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-webkit.bbappend create mode 100644 meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf index 94fd8c7b0..f5f720bc0 100644 --- a/meta-digi-dey/conf/layer.conf +++ b/meta-digi-dey/conf/layer.conf @@ -8,6 +8,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILES_DYNAMIC += " \ webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bb \ webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bbappend \ + selinux:${LAYERDIR}/dynamic-layers/selinux/*/*/*.bb \ + selinux:${LAYERDIR}/dynamic-layers/selinux/*/*/*.bbappend \ " BBFILE_COLLECTIONS += "digi-dey" diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-aws.bbappend b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-aws.bbappend new file mode 100644 index 000000000..072993cd7 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-aws.bbappend @@ -0,0 +1 @@ +include selinux_dey.inc diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-qt.bbappend b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-qt.bbappend new file mode 100644 index 000000000..072993cd7 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-qt.bbappend @@ -0,0 +1 @@ +include selinux_dey.inc diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-webkit.bbappend b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-webkit.bbappend new file mode 100644 index 000000000..072993cd7 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/dey-image-webkit.bbappend @@ -0,0 +1 @@ +include selinux_dey.inc diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc new file mode 100644 index 000000000..0bcf93ea6 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc @@ -0,0 +1 @@ +IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'packagegroup-core-selinux', '', d)}"