From 477da00510e3123f42f68b2869a8238afbcf9d85 Mon Sep 17 00:00:00 2001 From: Lei YU Date: Thu, 23 May 2019 16:44:39 +0800 Subject: meta-romulus: Fix ipmi configs The ipmi configs were using .bbappends to override the default ones. There was a change in OpenBMC about overriding variable assignments, that causes the .bbappends not working anymore due to they are native. This commit fixes the issue, by adding romulus specific configs to replace the default ones. Tested: Verify the ipmi sensor, fru are correct on Romulus. (From meta-ibm rev: e020d0d8973cb4fa36d382bc9af5c056e8d8e913) Change-Id: If804ced6d53c8c4433351b982ebcf079cd014f56 Signed-off-by: Lei YU Signed-off-by: Brad Bishop --- meta-ibm/meta-romulus/conf/machine/romulus.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta-ibm/meta-romulus/conf') diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 32ece45c48..3927cc5346 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -14,9 +14,12 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20 PHOSPHOR_MRW_URI = "git://github.com/open-power/romulus-xml" PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f" +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "romulus-occ-control-config-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "romulus-ipmi-fru-properties-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-bmc-inventory = "romulus-ipmi-fru-read-bmc-inventory-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "romulus-ipmi-fru-read-inventory-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel = "romulus-ipmi-inventory-sel-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "romulus-ipmi-sensor-inventory-native" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native" PREFERRED_PROVIDER_virtual/phosphor-logging-callouts = "romulus-phosphor-logging-callouts-native" -PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "romulus-occ-control-config-native" -- cgit v1.2.3