meta-ampere: redfish: remove Chassis/chassis instance
The /xyz/openbmc_project/inventory/system/chassis interface was added
before for sensor report and other features that
phosphor-inventory-manager.
With latest approach, it is no longer needed so this commit removes it.
The redundant Redfish Chassis/chassis instance is removed.
Tested:
1. Check Redfish /redfish/v1/Chassis without 'chassis' instance.
Change-Id: I4724f3c07a5b90d286aa6945d6714ea356868ebe
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
diff --git a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
deleted file mode 100644
index 1b5a119..0000000
--- a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-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-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
deleted file mode 100644
index 23f54e3..0000000
--- a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-description: >
- Ampere 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: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount"
- type: string
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 768c667..7c5678e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,5 +1,3 @@
-DEPENDS:append = " inventory-cleanup"
-
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
PACKAGECONFIG:append = " associations"
SRC_URI:append = " file://associations.json"
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 768c667..7c5678e 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,5 +1,3 @@
-DEPENDS:append = " inventory-cleanup"
-
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
PACKAGECONFIG:append = " associations"
SRC_URI:append = " file://associations.json"