diff options
| author | Lei YU <mine260309@gmail.com> | 2018-08-21 16:22:20 +0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-28 10:58:19 -0400 |
| commit | 8a56da7c28765ba967dd14789e0dbbc847cb8f6e (patch) | |
| tree | 6d27a014db267f27630bbbea2490007461ec4a4a /meta-phosphor | |
| parent | a974b4759eca1f5f956c0e0b3ff8bbf30e120155 (diff) | |
| download | talos-openbmc-8a56da7c28765ba967dd14789e0dbbc847cb8f6e.tar.gz talos-openbmc-8a56da7c28765ba967dd14789e0dbbc847cb8f6e.zip | |
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.
(From meta-phosphor rev: bf3edf1ce09f19836c38c2dd43ab4e50664fc46e)
Change-Id: I60e49c14bda25547fde9a2308470ed164ebbd249
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 2 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 42e08ce17..4d146c109 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -12,11 +12,13 @@ FILES_${PN}-updater-ubi += " \ # 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 \ " diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index eb2468d92..0b6723c89 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -57,6 +57,7 @@ RDEPENDS_${PN}-updater += " \ virtual-obmc-image-manager \ " EXTRA_OECONF += " \ + ACTIVE_BMC_MAX_ALLOWED=1 \ MEDIA_DIR=/run/media \ " |
