Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

1 files changed, 26 insertions, 7 deletions

diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
index bcb2d0136..150d373e6 100644
--- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,15 +1,34 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
-SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service"
-SRC_URI_append_mihawk = " file://ncsi-netlink.service"
 
-SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service"
-SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service"
+SRC_URI += " file://ncsi-netlink.service"
+SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service"
+FILES_${PN} += "${datadir}/network/*.json"
 
-do_install_append_ibm-ac-server() {
+EXTRA_OECONF += "--enable-sync-mac"
+
+install_network_configuration(){
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
+    install -d ${D}${datadir}/network/
+    install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json
+}
+
+SRC_URI_append_rainier = " file://inventory-object-map.json"
+do_install_append_rainier(){
+    install_network_configuration
+}
+
+SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json"
+do_install_append_ibm-ac-server() {
+    install_network_configuration
 }
+
+SRC_URI_append_mihawk = " file://inventory-object-map.json"
 do_install_append_mihawk() {
-    install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
+    install_network_configuration
+}
+
+SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json"
+do_install_append_witherspoon-tacoma(){
+    install_network_configuration
 }