diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2020-05-29 20:57:11 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-07-10 02:53:09 +0300 |
| commit | 27583a26f26873988ca746e370507deede0c2b1b (patch) | |
| tree | bc7ec1e7ac1a145f77f671d1e2d158d990588a77 /meta-phosphor | |
| parent | 9fba388c923b326bbaafd2c92e1641f6fe47d6d9 (diff) | |
| download | openbmc-27583a26f26873988ca746e370507deede0c2b1b.tar.xz | |
Add phosphor-image-signing if verify_signature is enabled
The phosphor-image-signing adds the public key to the BMC rootfs
and it was added if the UBI distro was enabled.
The phosphor-software-manager supports signature verification
regardless of the choice of BMC layout, so add it based if the
signature verification config (verify_signture) is enabled.
Otherwise the user would need to know that the package
phosphor-image-signing needed to be added if the signature
verification config was enabled, which is not intuitive. This way
it's done automatically.
Tested: Verified that adding verify_signature resulted in the
/etc/activationdata/ directory being added to the BMC
rootfs, and without it no directory was created.
(From meta-phosphor rev: 379f327e91542e7b2c3c4fb6b41b325b1a0a3412)
Change-Id: If0137b75f6de3b3087389c98229c85c346804912
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 1 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index e0314c050..0ab2a7515 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -44,6 +44,7 @@ DEPENDS += " \ RDEPENDS_${PN}-updater += " \ bash \ virtual-obmc-image-manager \ + ${@bb.utils.contains('PACKAGECONFIG', 'verify_signature', 'phosphor-image-signing', '', d)} \ " RPROVIDES_${PN}-version += " \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 8e6fe769c..81895ebc3 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -105,7 +105,6 @@ RDEPENDS_${PN}-sensors = " \ ${PN}-software-extras = "" ${PN}-software-extras_df-obmc-ubi-fs = " \ - phosphor-image-signing \ phosphor-software-manager-updater-ubi \ " |