diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 01:14:22 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 02:20:11 +0300 |
| commit | 0cfc19e6565d8e3a1aa563c59edb347f9128026f (patch) | |
| tree | 7146561723137e206a983483b06466d7ab5a9e2a /meta-openbmc-mods/meta-ast2500 | |
| parent | 930df2e58b9725756edbccf99fd4979026fc28fd (diff) | |
| download | openbmc-0cfc19e6565d8e3a1aa563c59edb347f9128026f.tar.xz | |
Update to internal 0.35
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500')
| -rw-r--r-- | meta-openbmc-mods/meta-ast2500/conf/layer.conf | 4 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf index 544cacc05..8575749fd 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/layer.conf +++ b/meta-openbmc-mods/meta-ast2500/conf/layer.conf @@ -7,8 +7,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "ast2500" -BBFILE_PATTERN_ast2500 = "" -BBFILE_PRIORITY_ast2500 = "4" +BBFILE_PATTERN_ast2500 = "^${LAYERDIR}/" +BBFILE_PRIORITY_ast2500 = "10" LAYERSERIES_COMPAT_ast2500 = "dunfell gatesgarth" INHERIT += "extrausers" diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend index 80aba4906..97102fdf1 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -16,6 +16,15 @@ RDEPENDS_${PN} += " default-fru" do_install_append() { install -d ${D}/usr/share/entity-manager/configurations - install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations - rm ${D}/usr/share/entity-manager/configurations/blocklist.json + install -m 0444 ${WORKDIR}/WC-Baseboard.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/WP-Baseboard.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/TNP-baseboard.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/FCXXPDBASSMBL_PDB.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/OPB2RH-Chassis.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/CYP-baseboard.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/J85894-HSBP.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/CPC-Baseboard.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/MIDPLANE-2U2X12SWITCH.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/WC-Chassis.json ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/blocklist.json ${D}/usr/share/entity-manager } |