summaryrefslogtreecommitdiff
path: root/meta-facebook
diff options
context:
space:
mode:
authorJayashree-D <jayashree-d@hcl.com>2021-02-04 14:32:51 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-03-15 15:59:21 +0300
commit5521d249699db8f0fac09afe0eb9bd6d5996b4f8 (patch)
tree8bf39ddf17965672f606dc1341c46807f21f5f31 /meta-facebook
parent0947bf23c7bde25281ffc1c61cf979bcc3f6b88e (diff)
downloadopenbmc-5521d249699db8f0fac09afe0eb9bd6d5996b4f8.tar.xz
Add settings-manager suppport for multihost.
Added settings manager support to create multiple dbus path for boot order configuration. TESTED: Tested in tiogapass and yosemitev2 hardware. Signed-off-by: Jayashree Dhanapal <jayashree-d@hcl.com> Change-Id: I51424a463804d3a59833abc5b230c0bd1f31553a
Diffstat (limited to 'meta-facebook')
-rwxr-xr-xmeta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb2
-rw-r--r--meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml39
-rw-r--r--meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend2
3 files changed, 43 insertions, 0 deletions
diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
index 77d87b762..6cc2450c5 100755
--- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
+++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
@@ -17,6 +17,8 @@ inherit cmake obmc-phosphor-ipmiprovider-symlink
EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1"
EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1"
+EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'"
+
LIBRARY_NAMES = "libzfboemcmds.so"
HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml
new file mode 100644
index 000000000..3fdc847c7
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml
@@ -0,0 +1,39 @@
+/xyz/openbmc_project/control/host1/boot:
+ - Interface: xyz.openbmc_project.Control.Boot.Source
+ Properties:
+ BootSource:
+ Default: Source::Sources::Default
+ - Interface: xyz.openbmc_project.Control.Boot.Mode
+ Properties:
+ BootMode:
+ Default: Mode::Modes::Regular
+
+/xyz/openbmc_project/control/host2/boot:
+ - Interface: xyz.openbmc_project.Control.Boot.Source
+ Properties:
+ BootSource:
+ Default: Source::Sources::Default
+ - Interface: xyz.openbmc_project.Control.Boot.Mode
+ Properties:
+ BootMode:
+ Default: Mode::Modes::Regular
+
+/xyz/openbmc_project/control/host3/boot:
+ - Interface: xyz.openbmc_project.Control.Boot.Source
+ Properties:
+ BootSource:
+ Default: Source::Sources::Default
+ - Interface: xyz.openbmc_project.Control.Boot.Mode
+ Properties:
+ BootMode:
+ Default: Mode::Modes::Regular
+
+/xyz/openbmc_project/control/host4/boot:
+ - Interface: xyz.openbmc_project.Control.Boot.Source
+ Properties:
+ BootSource:
+ Default: Source::Sources::Default
+ - Interface: xyz.openbmc_project.Control.Boot.Mode
+ Properties:
+ BootMode:
+ Default: Mode::Modes::Regular
diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
new file mode 100644
index 000000000..2b4c4c0cb
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append_yosemitev2 = " file://settings-manager.override.yml"