diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2021-08-06 19:25:30 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 20:28:12 +0300 |
| commit | b96c75046da8f72359d101c813f0694409bbe0d1 (patch) | |
| tree | ab68b1d00b439d9a09f5b6743e8a8bfa1e8e7087 /meta-ibm/recipes-phosphor/logging | |
| parent | 8c6707f0dcab30d2c0d818b455b030b5d7e7091c (diff) | |
| download | openbmc-b96c75046da8f72359d101c813f0694409bbe0d1.tar.xz | |
meta-ibm: prep for new override syntax
Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/logging')
| -rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 6 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 3163c07b98..d2efcda91f 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -31,8 +31,8 @@ SRC_URI += "file://policyTable.json" PACKAGECONFIG ??= "" PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,," -PACKAGECONFIG_ibm-ac-server = "policy-interface" -PACKAGECONFIG_mihawk = "policy-interface" +PACKAGECONFIG:ibm-ac-server = "policy-interface" +PACKAGECONFIG:mihawk = "policy-interface" SERVICE = "com.ibm.Logging.service" DBUS_SERVICE_${PN} += "${SERVICE}" @@ -43,7 +43,7 @@ DBUS_SERVICE_${PN} += "${SERVICE}" LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" SYSTEMD_LINK_${PN} += "${LOG_FMT}" -do_install_append(){ +do_install:append(){ install -d ${D}${datadir}/ibm-logging diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 01714829f0..3614174108 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,20 +1,20 @@ -PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" -PACKAGECONFIG_append_p10bmc = " openpower-pels" +PACKAGECONFIG:append:witherspoon-tacoma = " openpower-pels" +PACKAGECONFIG:append:p10bmc = " openpower-pels" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_p10bmc = " file://ibm,rainier-2u_dev_callouts.json" -SRC_URI_append_p10bmc = " file://ibm,rainier-4u_dev_callouts.json" -SRC_URI_append_p10bmc = " file://ibm,everest_dev_callouts.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" +SRC_URI:append:p10bmc = " file://ibm,rainier-2u_dev_callouts.json" +SRC_URI:append:p10bmc = " file://ibm,rainier-4u_dev_callouts.json" +SRC_URI:append:p10bmc = " file://ibm,everest_dev_callouts.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" #Enable phal feature, if available. -PACKAGECONFIG_append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -d ${D}/${datadir}/phosphor-logging/pels install -m 0644 ${WORKDIR}/ibm,rainier-2u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json install -m 0644 ${WORKDIR}/ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json |