From 67644eb49097c08c18bd070f28200fbc2cbbe752 Mon Sep 17 00:00:00 2001
From: Vijay Khemka <vijaykhemka@fb.com>
Date: Tue, 14 Apr 2020 11:27:36 -0700
Subject: meta-facebook: ipmb: Add machine specific dir

Removed machine specific info from meta data and created search path
for each machine type.

(From meta-facebook rev: 168f510d5c8865a5b825aa69a4bc1f3c4fd992ff)

Change-Id: I1ca32dd034f38ecece64ea384d23d4d462b78fd3
Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
 .../ipmi/phosphor-ipmi-ipmb/ipmb-channels.json           | 16 ----------------
 .../ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json | 16 ++++++++++++++++
 .../recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend  |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
 create mode 100644 meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json

(limited to 'meta-facebook')

diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
deleted file mode 100644
index 690f9e733b..0000000000
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "channels": [
-    {
-      "type": "me",
-      "slave-path": "/dev/ipmb-4",
-      "bmc-addr": 32,
-      "remote-addr": 44
-    },
-    {
-      "type": "ipmb",
-      "slave-path": "/dev/ipmb-9",
-      "bmc-addr": 32,
-      "remote-addr": 96
-    }
-  ]
-}
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json
new file mode 100644
index 0000000000..690f9e733b
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json
@@ -0,0 +1,16 @@
+{
+  "channels": [
+    {
+      "type": "me",
+      "slave-path": "/dev/ipmb-4",
+      "bmc-addr": 32,
+      "remote-addr": 44
+    },
+    {
+      "type": "ipmb",
+      "slave-path": "/dev/ipmb-9",
+      "bmc-addr": 32,
+      "remote-addr": 96
+    }
+  ]
+}
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index c2d5ed8b91..1a9d9e0a5c 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-SRC_URI_append_tiogapass = " file://ipmb-channels.json"
+SRC_URI_append = " file://ipmb-channels.json"
 
-do_install_append_tiogapass(){
+do_install_append() {
     install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
                    ${D}/usr/share/ipmbbridge
 }
-- 
cgit v1.2.3