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-intel-openbmc/meta-common/recipes-phosphor | |
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-intel-openbmc/meta-common/recipes-phosphor')
8 files changed, 16 insertions, 16 deletions
diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb index 0d1d016fe..625a81921 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb @@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit phosphor-mapper inherit native -PHOSPHOR_MAPPER_SERVICE_append = " com.intel" -PHOSPHOR_MAPPER_INTERFACE_append = " com.intel" +PHOSPHOR_MAPPER_SERVICE:append = " com.intel" +PHOSPHOR_MAPPER_INTERFACE:append = " com.intel" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb index cdb88bbfe..ea2fe75bb 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb @@ -25,7 +25,7 @@ PACKAGECONFIG[libintel_dbus] = " \ libsystemd \ " -PACKAGECONFIG_remove_class-native = "libintel_dbus" -PACKAGECONFIG_remove_class-nativesdk = "libintel_dbus" +PACKAGECONFIG:remove:class-native = "libintel_dbus" +PACKAGECONFIG:remove:class-nativesdk = "libintel_dbus" BBCLASSEXTEND += "native nativesdk" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend index ef991a58b..50f276aa6 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend @@ -1 +1 @@ -PHOSPHOR_MAPPER_CONFIGS_append_intel = " intel-dbus-interfaces-mapper-config-native" +PHOSPHOR_MAPPER_CONFIGS:append:intel = " intel-dbus-interfaces-mapper-config-native" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 4521fe8f8..6d6912dca 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:intel := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd -SYSTEMD_SERVICE_${PN}_intel = "phosphor-pid-control.service" -EXTRA_OECONF_intel = "--enable-configure-dbus=yes" +SYSTEMD_SERVICE:${PN}:intel = "phosphor-pid-control.service" +EXTRA_OECONF:intel = "--enable-configure-dbus=yes" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 876567f9a..652481d79 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -do_install_append_intel(){ +do_install:append:intel(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index e8cbbe928..29b98581f 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " file://ipmb-channels.json" +SRC_URI:append = " file://ipmb-channels.json" -do_install_append(){ +do_install:append(){ install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ ${D}/usr/share/ipmbbridge } diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index c7e2194ca..49b23e598 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_intel = " log-threshold" +PACKAGECONFIG:append:intel = " log-threshold" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index 590e9e629..a80a6d42d 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:intel := "${THISDIR}/${PN}:" -SRC_URI_append_intel = " file://config.json" +SRC_URI:append:intel = " file://config.json" -do_compile_prepend_intel() { +do_compile:prepend:intel() { cp -r ${WORKDIR}/config.json ${S}/ } |