diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2017-09-25 15:25:27 +0800 |
---|---|---|
committer | Jia Zhang <qianyue.zj@alibaba-inc.com> | 2017-09-25 03:25:27 -0400 |
commit | 6dff36ef09e5ea6b87f872ba5ae10c9e7af87fa2 (patch) | |
tree | 889b9ef67cadffe47597c7e34015ab669c8d61d1 | |
parent | afc39392a6efbbb9ce4fa214d57044358bf4d3d2 (diff) | |
download | meta-secure-core-6dff36ef09e5ea6b87f872ba5ae10c9e7af87fa2.tar.gz |
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>
-rw-r--r-- | meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks-initramfs.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb | 4 |
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 | |||
4 | 4 | ||
5 | RDEPENDS_${PN} += "\ | 5 | RDEPENDS_${PN} += "\ |
6 | cryptfs-tpm2-initramfs \ | 6 | cryptfs-tpm2-initramfs \ |
7 | packagegroup-tpm2-initramfs \ | 7 | ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'packagegroup-tpm2-initramfs', '', d)} \ |
8 | " | 8 | " |
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} += "\ | |||
41 | # @initrdscripts-ima: init.ima | 41 | # @initrdscripts-ima: init.ima |
42 | # @cryptfs-tpm2-initramfs: init.cryptfs | 42 | # @cryptfs-tpm2-initramfs: init.cryptfs |
43 | RRECOMMENDS_${PN} += "\ | 43 | RRECOMMENDS_${PN} += "\ |
44 | initrdscripts-ima \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'initrdscripts-ima', '', d)} \ |
45 | cryptfs-tpm2-initramfs \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'luks', 'cryptfs-tpm2-initramfs', '', d)} \ |
46 | " | 46 | " |