summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2019-05-03 22:34:40 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-05-30 19:29:57 +0300
commit85b484ca342da7732cf3ca9f602a4a49531bfe50 (patch)
treeef6a6017e531cab0ba452935cebf4d077467eea1
parentd216c789aa0fc202448e6bf9fc95f3bc5206f8ea (diff)
downloadopenbmc-85b484ca342da7732cf3ca9f602a4a49531bfe50.tar.xz
meta-ibm: Swift: Add inventory config YAML
It will create the xyz.openbmc_project.Inventory.Item.Chassis interface on the chassis. (From meta-ibm rev: 8074814d81f5bd8b3b9467e2392f1888059ec897) Change-Id: I40c3d94bfdce7388e6c525b253d6b456b10b8604 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml16
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml)0
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend2
4 files changed, 18 insertions, 2 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb
index cdb146c50..f68edcb62 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager"
+SUMMARY = "Copy the inventory cleanup yaml for inventory manager"
PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml
new file mode 100644
index 000000000..a2ff9d177
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml
@@ -0,0 +1,16 @@
+description: >
+ Swift 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-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml
index a363bda8d..a363bda8d 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 9b5b948fa..39f87342e 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -3,7 +3,7 @@ PACKAGECONFIG_append = " associations"
SRC_URI += "file://associations.json"
-DEPENDS_append_witherspoon = " inventory-cleanup"
+DEPENDS_append = " inventory-cleanup"
do_install_append() {
install -d ${D}${base_datadir}