Install packages if distro flag set (#21)

* install 'packagegroup-tpm2-initramfs' of distro flag 'tpm2' is set
* install 'initrdscripts-ima' if distro flag 'ima' is set
* install 'cryptfs-tpm2-initramfs' if distro flag 'luks' is set

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks-initramfs.bb b/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks-initramfs.bb
index 34bc907..5a31477 100644
--- a/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks-initramfs.bb
+++ b/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks-initramfs.bb
@@ -4,5 +4,5 @@ require packagegroup-luks.inc
 
 RDEPENDS_${PN} += "\
     cryptfs-tpm2-initramfs \
-    packagegroup-tpm2-initramfs \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'packagegroup-tpm2-initramfs', '', d)} \
 "
diff --git a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
index 8b912ad..ca30e84 100644
--- a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
+++ b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
@@ -41,6 +41,6 @@ RDEPENDS_${PN} += "\
 # @initrdscripts-ima: init.ima
 # @cryptfs-tpm2-initramfs: init.cryptfs
 RRECOMMENDS_${PN} += "\
-    initrdscripts-ima \
-    cryptfs-tpm2-initramfs \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'initrdscripts-ima', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'luks', 'cryptfs-tpm2-initramfs', '', d)} \
 "