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-ibm/recipes-phosphor/power | |
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-ibm/recipes-phosphor/power')
4 files changed, 22 insertions, 22 deletions
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index c2f5b2cc5..c8d6a4617 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" -EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" +EXTRA_OEMESON:append:ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON:append:p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" +EXTRA_OEMESON:append:mihawk = " -Dpower_sequencer=mihawk-cpld" -DEPENDS_append_ibm-ac-server = " power-sequencer" -DEPENDS_append_p10bmc = " power-sequencer" +DEPENDS:append:ibm-ac-server = " power-sequencer" +DEPENDS:append:p10bmc = " power-sequencer" -PACKAGECONFIG_append_ibm-ac-server = " monitor" -PACKAGECONFIG_append_swift = " monitor" -PACKAGECONFIG_append_mihawk = " monitor" +PACKAGECONFIG:append:ibm-ac-server = " monitor" +PACKAGECONFIG:append:swift = " monitor" +PACKAGECONFIG:append:mihawk = " monitor" -do_install_append(){ +do_install:append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } -FILES_${PN} += "${datadir}/phosphor-power/psu.json" +FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index 6fc1133cf..17ff4c206 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb @@ -5,21 +5,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml" -SRC_URI_append_p10bmc = " file://ucd90160.yaml" +SRC_URI:append:ibm-ac-server = " file://ucd90160.yaml" +SRC_URI:append:p10bmc = " file://ucd90160.yaml" -FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" -FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES:${PN}:append:ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES:${PN}:append:p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" S = "${WORKDIR}" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml } -do_install_append_p10bmc() { +do_install:append:p10bmc() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 5ea6cb522..fb02ace05 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb @@ -9,7 +9,7 @@ require recipes-phosphor/power/phosphor-power.inc S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { SRC=${S}/org/open_power/Witherspoon DEST=${D}${yaml_dir}/org/open_power/Witherspoon install -d ${DEST} diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4f599a78c..74bb9a0c5 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" SYNC_SERVICE = "power-supply-sync.service" TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" -SYSTEMD_SERVICE_${PN} += "${SYNC_SERVICE}" -SYSTEMD_LINK_${PN} += "${SYNC_FMT}" +SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" +SYSTEMD_LINK:${PN} += "${SYNC_FMT}" |