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.
Change-Id: I2c03ab67d925c9b8a7ad0f95bce56b909767cea2
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/recipes-phosphor/flash/phosphor-software-manager_git.bb b/recipes-phosphor/flash/phosphor-software-manager_git.bb
index e0314c0..0ab2a75 100644
--- a/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -44,6 +44,7 @@
RDEPENDS_${PN}-updater += " \
bash \
virtual-obmc-image-manager \
+ ${@bb.utils.contains('PACKAGECONFIG', 'verify_signature', 'phosphor-image-signing', '', d)} \
"
RPROVIDES_${PN}-version += " \
diff --git a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 8e6fe76..81895eb 100644
--- a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -105,7 +105,6 @@
${PN}-software-extras = ""
${PN}-software-extras_df-obmc-ubi-fs = " \
- phosphor-image-signing \
phosphor-software-manager-updater-ubi \
"