summaryrefslogtreecommitdiffstats
path: root/meta-openpower
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-03-12 13:46:14 -0400
committerAndrew Geissler <geissonator@yahoo.com>2019-03-21 19:02:44 -0500
commit0eed311783bbcc86741d7233478d8e60400d0f54 (patch)
tree29776af5fcb1851da3f52fa67a2ba83dbef636d8 /meta-openpower
parent984d320b84a38fa7b1fe8a32ad96910fd6b22d5a (diff)
downloadtalos-openbmc-0eed311783bbcc86741d7233478d8e60400d0f54.tar.gz
talos-openbmc-0eed311783bbcc86741d7233478d8e60400d0f54.zip
meta-openpower: move some metadata to machine conf
Install the openpower-ipmi-oem whitelist. It is not currently installed because the ipmid recipe looks for whitelists in VIRTUAL-RUNTIME_phosphor-ipmi-providers and openpower-ipmi-oem is not set there. Move VIRTUAL-RUNTIME_phosphor-ipmi-providers += openpower-ipmi-oem to the machine configuration so that the whitelist is detected by the ipmid recipe and installed. (From meta-openpower rev: df7a13f6328a0b8c45e255e553bfbf38497e8179) Change-Id: Ibc94c2d5218a8ae4e78998c677d7405d1445f10b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openpower')
-rw-r--r--meta-openpower/conf/machine/include/openpower.inc5
-rw-r--r--meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend5
2 files changed, 9 insertions, 1 deletions
diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc
index cbfe4fa0c..feb37acaa 100644
--- a/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openpower/conf/machine/include/openpower.inc
@@ -11,6 +11,11 @@ OBMC_MACHINE_FEATURES += "\
VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
+# Add OpenPOWER OEM commands handler library
+VIRTUAL-RUNTIME_phosphor-ipmi-providers_append_df-openpower = " \
+ openpower-ipmi-oem \
+"
+
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt"
PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps"
PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps"
diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
index 7b25c0acb..09b4200e2 100644
--- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
+++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
@@ -1,4 +1,7 @@
+# Warning: Any providers listed here will have their whitelists ignored. Add
+# providers with whitelists that should not be ignored to
+# conf/machine/openpower.inc
+
VIRTUAL-RUNTIME_phosphor-ipmi-providers_append_df-openpower = " \
openpower-host-ipmi-flash \
- openpower-ipmi-oem \
"
OpenPOWER on IntegriCloud