commit bf3edf1ce09f19836c38c2dd43ab4e50664fc46e
author Lei YU <mine260309@gmail.com> Tue Aug 21 16:22:20 2018 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 28 13:36:04 2018 +0000
tree 35ab0bb86b4a3b3fd4ba0635c9b7972894bc8526
parent f43eb6ee89433e4898cbdb1532963f038419c003

phosphor-software-manager: Add ACTIVE_BMC_MAX_ALLOWED config

For static flash layout, configure ACTIVE_BMC_MAX_ALLOWED to 1, because
it has only one active BMC image;
For ubi-fs, configure ACTIVE_BMC_MAX_ALLOWED to 2, because ubi-fs
assumes there are two BMC images by default.

Resolves openbmc/phosphor-bmc-code-mgmt#2

Tested: Verify that ACTIVE_BMC_MAX_ALLOWED is set to 1 for Romulus
        build, and set to 2 for Witherspoon build.

Change-Id: I89b26f2dbd4640c9813d975dc603ffc875af8837
Signed-off-by: Lei YU <mine260309@gmail.com>

classes/phosphor-software-manager-ubi-fs.bbclass

diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 42e08ce..4d146c1 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -12,11 +12,13 @@
 
 # Remove default configs
 EXTRA_OECONF_remove_df-obmc-ubi-fs += " \
+    ACTIVE_BMC_MAX_ALLOWED=1 \
     MEDIA_DIR=/run/media \
 "
 
 # Add ubi-fs configs
 EXTRA_OECONF_append_df-obmc-ubi-fs += " \
+    ACTIVE_BMC_MAX_ALLOWED=2 \
     MEDIA_DIR=/media \
 "
 

common/recipes-phosphor/flash/phosphor-software-manager.bb

diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index eb2468d..0b6723c 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -57,6 +57,7 @@
     virtual-obmc-image-manager \
 "
 EXTRA_OECONF += " \
+    ACTIVE_BMC_MAX_ALLOWED=1 \
     MEDIA_DIR=/run/media \
 "