diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-08-12 13:21:36 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-08-13 11:00:42 +0300 |
| commit | ca3e1d9f86212282ca59f384055497eb0d156d49 (patch) | |
| tree | 83e2db0f50a87dfab90432a5c02e11d91ce2f6f3 /meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb | |
| parent | 5037330368f3e01c45dc0e42b39246afa2c6c44a (diff) | |
| download | openbmc-ca3e1d9f86212282ca59f384055497eb0d156d49.tar.xz | |
meta-ampere: fix compilation error with latest Yocto
Make the following changes to fix compilation errors:
1. Add honister to LAYERSERIES_COMPAT
2. Increase CONF_VERSION to 2.
3. Fix mistake on previous change on Yocto syntax update.
Tested:
1. Compile OpenBMC for Mt.Jade without error.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I5ac3f568d776109955759fab78844b1d38a51af1
Diffstat (limited to 'meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb')
| -rw-r--r-- | meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb index 90c4520d1..2ca18a0be 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -13,7 +13,7 @@ OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" # Copies config file having arguments for psu # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \ +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ obmc/gpio/PSU2_B25 \ " SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" @@ -21,13 +21,12 @@ SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" SRC_URI += "file://ampere_psu_reset_hotswap.sh" do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/ampere_psu_reset_hotswap.sh \ - ${D}${bindir}/ampere_psu_reset_hotswap.sh + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/ampere_psu_reset_hotswap.sh ${D}${sbindir}/ } GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" |