diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-09-02 00:17:33 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-09-02 16:19:25 +0300 |
| commit | e83c22094b7e4970c96bcee273ab08d05bbc0a30 (patch) | |
| tree | 80cb87a34afb07b7d375b534bb5df68468c2b5a6 /meta-openpower/recipes-phosphor/host/checkstop-monitor.bb | |
| parent | d97cf9b9ef84cdad2f357164e36b76619e7dc379 (diff) | |
| download | openbmc-e83c22094b7e4970c96bcee273ab08d05bbc0a30.tar.xz | |
meta-phosphor: change systemd.bbclass to match upstream override syntax
Upstream bbclasses changed to typically use the `:${PN}` override
syntax, including the SYSTEMD_ variables. Change our systemd.bbclass
to do the same for consistency and perform a tree-wide variable
replacement.
Spot checked by building bletchley and witherspoon and checking
some of the SYSTEMD_LINK directives on installed packages under qemu.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb
Diffstat (limited to 'meta-openpower/recipes-phosphor/host/checkstop-monitor.bb')
| -rw-r--r-- | meta-openpower/recipes-phosphor/host/checkstop-monitor.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 83f3a3e03f..9b1b1c4c5f 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -14,7 +14,7 @@ OBMC_HOST_MONITOR_INSTANCES = "checkstop" # Copies config file having arguments for monitoring host checkstop # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/checkstop" # This package is not supplying the unit file and also this is not a native # recipe since state-mgmt needs this package at runtime. Unsetting this below @@ -22,10 +22,10 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" SYSTEMD_SERVICE:${PN} ?="" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" +SYSTEMD_OVERRIDE:${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" STATES = "startmin" GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{1}.service" CHECKSTOP_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:obmc-host-{0}@{2}.target.wants/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" |