| commit | d74aed3c265dd3240c60f2b246492795df72050e | [log] [tgz] |
|---|---|---|
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | Tue Aug 29 08:00:08 2023 +0200 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Fri Sep 08 13:37:30 2023 +0000 |
| tree | d80d99460f9df45c29e4c0b5270cb219699fae2e | |
| parent | 21a6a8f5a71d30e0c452b0789055ce667084f667 [diff] |
meta-ibm/meta-sbp1/recipes-phosphor: Fix inventory Fix commit d7191a5492f3a6864a28806cf8ea2d21e5482499 "meta-ibm/sbp1: Add inventory". Actually do generate an inventory based on added YAML. TEST: Verified that generated.cpp is not empty. Change-Id: Ib626f3777ba1db29dfee653b487256a5bed4f592 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 9cff727..28e459c 100644 --- a/meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,7 +1 @@ -FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" - -SRC_URI:append = " file://inventory.yaml" - -do_install:append() { - install -D ${WORKDIR}/inventory.yaml ${D}${base_datadir}/events.d/inventory.yaml -} +DEPENDS:append = " static-inventory"
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/inventory/static-inventory.bb b/meta-ibm/meta-sbp1/recipes-phosphor/inventory/static-inventory.bb new file mode 100644 index 0000000..3a40203 --- /dev/null +++ b/meta-ibm/meta-sbp1/recipes-phosphor/inventory/static-inventory.bb
@@ -0,0 +1,17 @@ +SUMMARY = "Copy the static inventory 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://static-inventory.yaml" + +do_install() { + install -D static-inventory.yaml ${D}${base_datadir}/events.d/static-inventory.yaml +} + +FILES:${PN} += "${base_datadir}/events.d/static-inventory.yaml"
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager/inventory.yaml b/meta-ibm/meta-sbp1/recipes-phosphor/inventory/static-inventory/static-inventory.yaml similarity index 100% rename from meta-ibm/meta-sbp1/recipes-phosphor/inventory/phosphor-inventory-manager/inventory.yaml rename to meta-ibm/meta-sbp1/recipes-phosphor/inventory/static-inventory/static-inventory.yaml