From 0eed311783bbcc86741d7233478d8e60400d0f54 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 12 Mar 2019 13:46:14 -0400 Subject: 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 Signed-off-by: Andrew Geissler --- meta-openpower/conf/machine/include/openpower.inc | 5 +++++ .../packagegroups/packagegroup-obmc-ipmid-providers.bbappend | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index cbfe4fa0c9..feb37acaa0 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 7b25c0acb5..09b4200e22 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 \ " -- cgit v1.2.3