diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
| commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
| tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-inspur/meta-fp5280g2/recipes-phosphor/inventory | |
| parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
| parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
| download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz | |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/inventory')
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb index 11ff66261..145078f09 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb @@ -15,4 +15,4 @@ do_install() { install -D chassis.yaml ${D}${base_datadir}/events.d/chassis.yaml } -FILES_${PN} += "${base_datadir}/events.d/chassis.yaml" +FILES:${PN} += "${base_datadir}/events.d/chassis.yaml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 325086aca..0620c2d8c 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " associations" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:append = " associations" SRC_URI += " file://associations.json" DEPENDS += " phosphor-inventory-manager-chassis" -do_install_append() { +do_install:append() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } |