From 5572be3b99099bcbc7965ca692faf885a88a665f Mon Sep 17 00:00:00 2001
From: Lei YU <mine260309@gmail.com>
Date: Tue, 14 Jan 2020 17:17:01 +0800
Subject: meta-romulus: Add inventory-cleanup.yaml

The yaml add the "xyz.openbmc_project.Inventory.Item.Chassis" interface
to "/xyz/openbmc_project/inventory/system/chassis" object.

This is needed for bmcweb to correctly get the chassis id in
/redfish/v1/Chassis/.

Tested: Verify that /redfish/v1/Chassis/chassis exists on Romulus with
        this change. It was 404 without this change.

(From meta-ibm rev: 41b829feead473e5541f7d4c3c075e2b1a525c45)

Signed-off-by: Lei YU <mine260309@gmail.com>
Change-Id: Ie091ad32315fb4b4e45d8b35966a7a238dd1d539
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-phosphor/inventory/inventory-cleanup.bb     | 17 +++++++++++++++++
 .../inventory/inventory-cleanup/inventory-cleanup.yaml  | 16 ++++++++++++++++
 .../inventory/phosphor-inventory-manager_%.bbappend     |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb
 create mode 100644 meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
 create mode 100644 meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend

(limited to 'meta-ibm/meta-romulus/recipes-phosphor')

diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb
new file mode 100644
index 0000000000..0c4b56f721
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Copy the inventory cleanup yaml for inventory manager"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit allarch
+inherit phosphor-inventory-manager
+
+S = "${WORKDIR}"
+
+SRC_URI = "file://inventory-cleanup.yaml"
+
+do_install() {
+        install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml
+}
+
+FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
new file mode 100644
index 0000000000..0f72008c77
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
@@ -0,0 +1,16 @@
+description: >
+    Romulus inventory fixups
+
+events:
+    - name: Add Chassis interface
+      description: >
+          Add the chassis interface on the chassis inventory path
+      type: startup
+      actions:
+          - name: createObjects
+            objs:
+                /system/chassis:
+                  xyz.openbmc_project.Inventory.Item.Chassis:
+                      Type:
+                          value: "RackMount"
+                          type: string
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
new file mode 100644
index 0000000000..d552f5763a
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -0,0 +1 @@
+DEPENDS_append = " inventory-cleanup"
-- 
cgit v1.2.3