diff options
Diffstat (limited to 'meta-inspur')
9 files changed, 45 insertions, 6 deletions
diff --git a/meta-inspur/MAINTAINERS b/meta-inspur/MAINTAINERS index af86b18f7..8606eaf65 100644 --- a/meta-inspur/MAINTAINERS +++ b/meta-inspur/MAINTAINERS @@ -43,5 +43,5 @@ START OF MAINTAINERS LIST ------------------------- M: John Wang <wangzqbj@inspur.com> <JohnWang!> -R: George Liu <liuxiwei@inspur.com> <liuxiwei!> +M: George Liu <liuxiwei@inspur.com> <liuxiwei!> R: Lei Yu <mine260309@gmail.com> <LeiYU!> diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index ba1464abb..cbad25467 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "warrior zeus" +LAYERSERIES_COMPAT_inspur-layer = "warrior zeus dunfell" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index b855dbd29..10411c234 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "warrior zeus" +LAYERSERIES_COMPAT_fp5280g2-layer = "warrior zeus dunfell" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 1db0942d8..2e3dcadbb 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_fp5280g2:= "${THISDIR}/${BPN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # Package configuration FAN_PACKAGES += " \ diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 9f8035b5a..1fa652df7 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,2 @@ RDEPENDS_${PN}-inventory_append_fp5280g2 = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" -RDEPENDS_${PN}-extras_append_fp5280g2 = " phosphor-power phosphor-power-systemd-links phosphor-webui" +RDEPENDS_${PN}-extras_append_fp5280g2 = " phosphor-fp5280g2-psu-update phosphor-psu-software-manager phosphor-power phosphor-power-systemd-links phosphor-webui" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb new file mode 100644 index 000000000..3cc63868a --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb @@ -0,0 +1,20 @@ +HOMEPAGE = "https://github.com/inspur-bmc/fp5280g2-psu-update-tool" + +SRC_URI = "git://github.com/inspur-bmc/fp5280g2-psu-update-tool" + +SRCREV = "d9cc0d32197163197c41dc1c5e4613edd7ebacf1" + +SUMMARY = "Phosphor FP5280G2 PSU Update Tool" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +S = "${WORKDIR}/git/" +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/fp5280g2-psu-update ${D}${bindir}/fp5280g2-psu-update +} + +INSANE_SKIP_${PN} = "ldflags" + diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager/psu-update@.service b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager/psu-update@.service new file mode 100644 index 000000000..86d784eb0 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager/psu-update@.service @@ -0,0 +1,17 @@ +# This service shall be started with two arguments: +# * The PSU inventory DBus object +# * The path of the PSU images +# E.g. +# "psu-update@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply0\x20-tmp-image-abcdefg.service" +# expands to +# /usr/bin/fp5280g2-psu-update /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 /tmp/image/abcdefg + +[Unit] +Description=Update PSU %I + +[Service] +Type=oneshot +RemainAfterExit=no +Environment="ARGS=%I" +ExecStart=/usr/bin/fp5280g2-psu-update $ARGS +SyslogIdentifier=fp5280g2-psu-update diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend new file mode 100644 index 000000000..6d4804d12 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index b2d393514..eb9464a0e 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "warrior zeus" +LAYERSERIES_COMPAT_on5263m5-layer = "warrior zeus dunfell" |