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-core | |
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-core')
-rw-r--r-- | meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb | 2 | ||||
-rw-r--r-- | meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index 1236cbfc7..7d30a7d83 100644 --- a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -11,6 +11,6 @@ SRCREV = "4a6e45c4c2f38bc64afe5faac05ea82b3adb8d93" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.HostErrorMonitor.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.HostErrorMonitor.service" EXTRA_OECMAKE = "-DYOCTO=1" diff --git a/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend index 090b40e40..6f19a5e90 100644 --- a/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend @@ -1,9 +1,9 @@ # Remove these files since they are provided by obmc-intel-targets -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-start@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-stop@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-reboot@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-startmin@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweron@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-hard-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-powerreset@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-host-start@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-host-stop@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-host-reboot@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-host-startmin@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-chassis-poweron@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-chassis-poweroff@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-chassis-hard-poweroff@.target" +SYSTEMD_SERVICE:${PN}:remove:intel += " obmc-chassis-powerreset@.target" |