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-quanta/meta-q71l | |
| 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-quanta/meta-q71l')
| -rw-r--r-- | meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 4 | ||||
| -rw-r--r-- | meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 3953f8375..48bd7d2a1 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index a2da0e3b9..16cc2722a 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,6 +21,6 @@ Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" EXTRA_OEMESON:append:quanta-q71l = " -Dnegative-errno-on-fail=true" |