meta-ibm: consolidate network device mappings

Move to a common file for all platforms that use the common mapping of
ethernet0 and ethernet1.

This was done as an optimization while adding system1 support in.

Tested:
- Confirmed sbp1 and system1 had correct common file
- Confirmed witherspoon had it's specific ibm-ac-server file

Change-Id: Id96ac9f669fa5cf1241958c5d2d958a95065b25e
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

9 files changed, 22 insertions, 39 deletions

diff --git a/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network/config.json b/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network/config.json
deleted file mode 100644
index cd28c113d8..0000000000
--- a/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "eth0":"ethernet0",
-    "eth1":"ethernet1"
-}
diff --git a/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network_%.bbappend
deleted file mode 100644
index b91e82f911..0000000000
--- a/meta-ibm/meta-genesis3/recipes-phosphor/network/phosphor-network_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-PACKAGECONFIG:append = " sync-mac"
-SRC_URI += " \
-    file://config.json \
-    "
-FILES:${PN} += "${datadir}/network/*.json"
-
-do_install:append() {
-    install -d ${D}${datadir}/network/
-    install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/
-}
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network/config.json b/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network/config.json
deleted file mode 100644
index cd28c113d8..0000000000
--- a/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "eth0":"ethernet0",
-    "eth1":"ethernet1"
-}
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network_%.bbappend
deleted file mode 100644
index b91e82f911..0000000000
--- a/meta-ibm/meta-sbp1/recipes-phosphor/network/phosphor-network_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-PACKAGECONFIG:append = " sync-mac"
-SRC_URI += " \
-    file://config.json \
-    "
-FILES:${PN} += "${datadir}/network/*.json"
-
-do_install:append() {
-    install -d ${D}${datadir}/network/
-    install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/
-}
diff --git a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ibm-basic-eth-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ibm-basic-eth-map.json
new file mode 100644
index 0000000000..286905385b
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ibm-basic-eth-map.json
@@ -0,0 +1,3 @@
+{
+        "eth0":"ethernet"
+}
diff --git a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json
deleted file mode 100644
index 52280a4e67..0000000000
--- a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "eth0":"ethernet"
-}
diff --git a/meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-basic-eth-map.json
index 08bb92aeda..08bb92aeda 100644
--- a/meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json
+++ b/meta-ibm/recipes-phosphor/network/network/ibm-basic-eth-map.json
diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ibm-basic-eth-map.json
index 9f535ca8fb..9f535ca8fb 100644
--- a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json
+++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ibm-basic-eth-map.json
diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
index 2cca900780..b935427418 100644
--- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -36,7 +36,7 @@ PACKAGECONFIG:append:p10bmc = " hyp-nw-config"
 
 install_network_configuration(){
     install -d ${D}${datadir}/network/
-    install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json
+    install -m 0644 ${WORKDIR}/ibm-basic-eth-map.json ${D}${datadir}/network/config.json
 }
 
 do_install:append() {
@@ -45,17 +45,32 @@ do_install:append() {
     install -m 0755 ${WORKDIR}/ncsi-wait-and-set-speed ${D}${libexecdir}
 }
 
-SRC_URI:append:p10bmc = " file://inventory-object-map.json"
+SRC_URI:append:p10bmc = " file://ibm-basic-eth-map.json"
 do_install:append:p10bmc(){
     install_network_configuration
 }
 
-SRC_URI:append:ibm-ac-server = " file://inventory-object-map.json"
+SRC_URI:append:ibm-ac-server = " file://ibm-basic-eth-map.json"
 do_install:append:ibm-ac-server() {
     install_network_configuration
 }
 
-SRC_URI:append:witherspoon-tacoma = " file://inventory-object-map.json"
+SRC_URI:append:witherspoon-tacoma = " file://ibm-basic-eth-map.json"
 do_install:append:witherspoon-tacoma(){
     install_network_configuration
 }
+
+SRC_URI:append:genesis3 = " file://ibm-basic-eth-map.json"
+do_install:append:genesis3(){
+    install_network_configuration
+}
+
+SRC_URI:append:sbp1 = " file://ibm-basic-eth-map.json"
+do_install:append:sbp1(){
+    install_network_configuration
+}
+
+SRC_URI:append:system1 = " file://ibm-basic-eth-map.json"
+do_install:append:system1(){
+    install_network_configuration
+}