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 <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

10 files changed, 64 insertions, 5 deletions

diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
index 32ece45c4..3927cc534 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"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 4db6f3a6d..000000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
deleted file mode 100644
index 4db6f3a6d..000000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 4db6f3a6d..000000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb
new file mode 100644
index 000000000..57d7e7c16
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Romulus FRU properties config for ipmi-fru-parser"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+inherit native
+inherit phosphor-ipmi-fru
+
+SRC_URI += "file://extra-properties.yaml"
+
+PROVIDES += "virtual/phosphor-ipmi-fru-properties"
+
+S = "${WORKDIR}"
+
+do_install() {
+        DEST=${D}${properties_datadir}
+        install -d ${DEST}
+        install extra-properties.yaml ${DEST}
+}
+
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties/extra-properties.yaml
index ae626ed05..ae626ed05 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties/extra-properties.yaml
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb
new file mode 100644
index 000000000..71b23d938
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Romulus BMC accesible FRU inventory map for phosphor-ipmi-host"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+inherit native
+inherit phosphor-ipmi-host
+
+SRC_URI += "file://bmc-fru-config.yaml"
+
+S = "${WORKDIR}"
+
+PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
+
+do_install_append() {
+    DEST=${D}${config_datadir}
+    install -d ${DEST}
+    install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml
+}
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
index 597368950..597368950 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb
new file mode 100644
index 000000000..97fee4d37
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Romulus sensor config for phosphor-host-ipmi"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+inherit native
+inherit phosphor-ipmi-host
+
+PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
+
+SRC_URI += "file://config.yaml"
+
+S = "${WORKDIR}"
+
+do_install() {
+        DEST=${D}${sensor_datadir}
+        install -d ${DEST}
+        install config.yaml ${DEST}/sensor.yaml
+}
+
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory/config.yaml
index 1938135e3..1938135e3 100755
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory/config.yaml