From 8a56da7c28765ba967dd14789e0dbbc847cb8f6e Mon Sep 17 00:00:00 2001 From: Lei YU Date: Tue, 21 Aug 2018 16:22:20 +0800 Subject: 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 Signed-off-by: Brad Bishop --- meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-phosphor/classes') 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 \ " -- cgit v1.2.1