From 516363e50000bf4c41a32dbe521ce50727eaded2 Mon Sep 17 00:00:00 2001 From: Joseph Reynolds Date: Wed, 4 Aug 2021 10:01:42 -0500 Subject: Remove redundant code to set root password Background: The OpenBmc project default root account password is set in meta-phosphor/conf/distro/include/phosphor-defaults.inc and can be customized in each layer's local.conf file. Many of these local.conf.sample files had redundant code to set the password, which probably should not have been there. Removing them allows the defaults in phosphor-defaults.inc to take effect. Tested: No. Only meta-ibm was tested. Signed-off-by: Joseph Reynolds Change-Id: I76dce00d269d7afa005d7bcfd63f846d3cf45596 --- meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 57260f06b..45061f767 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -33,6 +33,7 @@ IMAGE_FEATURES_remove_witherspoon = "obmc-user-mgmt-ldap" # The service account does not have a home directory. The home directory is # set to / (the root directory) to allow dropbear ssh connections. +# Override defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc inherit extrausers # The password hash used here is the traditional 0penBmc password. -- cgit v1.2.3 From 356f9e1eaf8223f98db58fbe65400d3ad3190f7d Mon Sep 17 00:00:00 2001 From: Joseph Reynolds Date: Fri, 23 Jul 2021 20:15:32 -0500 Subject: Change default password hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Background: OpenBMC provisions the BMC firmware image with the root account password in a form which is no longer acceptable to Linux-PAM version 1.5.1. Specifically, [phosphor-defaults.inc][] sets the password hash into /etc/shadow as "\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/", where $1 indicates the deprecated [MD5 hash algorithm][].  Ref: [wikipedia passwd entry][].  Beginning around PAM version 1.5.1, when you log in, the [pam_unix.so module][] authenticates okay but requires the password to be changed.  (For example, you'll get a message like "You are required to change your password immediately (administrator enforced)."  This behavior is undesirable for OpenBMC project defaults, and is not tolerated by the project's current continuous integration tools.) This change is to replace the password hash to keep the same cleartext password but hashed with an acceptable algorithm. Specifically, the password hash supplied in phosphor-defaults.inc is updated to use the same password as before but encoded with the SHA-512 algorithm.  The hash was generated by the `openssl passwd -6 0penBmc` command.  This change ought to be transparent and forward and backward compatible. Note various meta-layers use this same hash string in conf/local.conf.sample files. They are changed to match. References: [phosphor-defaults.inc]: https://github.com/openbmc/openbmc/blob/1a977b269ed437bebb9ae7810e3157746ec9174d/meta-phosphor/conf/distro/include/phosphor-defa ults.inc#L245 [wikipedia passwd entry]: https://en.wikipedia.org/wiki/Passwd [pam_unix.so module]: https://github.com/linux-pam/linux-pam/tree/master/modules/pam_unix [MD5 hash algorithm]: https://en.wikipedia.org/wiki/MD5 Tested: Created image with new password hash and PAM 1.5.1 and checked that login works okay and does not require the passwod to be changed. Signed-off-by: Joseph Reynolds Change-Id: I5b189374f08ba506dbed7f8b9b991f2808cc3bc5 --- meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 8 +++----- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 6 +++++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 45061f767..05fc30378 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -36,10 +36,8 @@ IMAGE_FEATURES_remove_witherspoon = "obmc-user-mgmt-ldap" # Override defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc inherit extrausers -# The password hash used here is the traditional 0penBmc password. - #IBM_EXTRA_USERS_PARAMS += " \ -# usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ +# usermod -p ${DEFAULT_OPENBMC_PASSWORD} root; \ # " # Add group "wheel" (before adding the "service" account). @@ -50,13 +48,13 @@ IBM_EXTRA_USERS_PARAMS += " \ # Add the "admin" account. IBM_EXTRA_USERS_PARAMS += " \ useradd -M -d / --groups priv-admin,redfish,web -s /sbin/nologin admin; \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' admin; \ + usermod -p ${DEFAULT_OPENBMC_PASSWORD} admin; \ " # Add the "service" account. IBM_EXTRA_USERS_PARAMS += " \ useradd -M -d / --groups priv-admin,redfish,web,wheel service; \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' service; \ + usermod -p ${DEFAULT_OPENBMC_PASSWORD} service; \ " # This is recipe specific to ensure it takes effect. diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index e3eb454ae..63aee78dc 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -246,6 +246,10 @@ EXTRA_OEMESON_append_class-target = " -Db_lto=true" # Override this in your local.conf inherit extrausers +# This is the default password for the OpenBMC root user account (0penBmc) +# salted and hashed with SHA512 suitable for /etc/shadow or `usermod -p`. +DEFAULT_OPENBMC_PASSWORD = "'\$6\$UGMqyqdG\$GqTb3tXPFx9AJlzTw/8X5RoW2Z.100dT.acuk8AFJfNQYr.ZRL8itMIgLqsdq46RNHgiv78XayOSl.IbR4DFU.'" + EXTRA_USERS_PARAMS_pn-obmc-phosphor-image = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + usermod -p ${DEFAULT_OPENBMC_PASSWORD} root; \ " -- cgit v1.2.3 From bcc5f6b0f24e8ad0b03b8217e88a19ff3002c084 Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Tue, 8 Jun 2021 15:47:53 +0530 Subject: Override pldm response time out value This commit would override response time out value for a request to 4.8 seconds for all the ibm machines. We have seen in our debugging that in rare cases host takes close to 5 seconds to respond to the pldm message.This value (4.8 seconds) is in sync with what phyp maintains for their messages(5 seconds). As we do lot of fileIO operations, and the number of PDR's tend to grow, picking 4.8 seconds seems to be less risky path & also larger timeout would reduce the number of retries from BMC incase if the host does not respond within 2-3 seconds. Signed-off-by: Manojkiran Eda Change-Id: Ic0eac42b66dbc2c6d69bff440fe590775f35e390 --- meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 32809764b..b57abd8f4 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,4 +1,8 @@ PACKAGECONFIG += "oem-ibm" PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" +EXTRA_OEMESON_append = " \ + -Dresponse-time-out=4800 \ +" + SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" -- cgit v1.2.3 From e26b91a8ff04d6550fc6a8ac115ad6805228a72f Mon Sep 17 00:00:00 2001 From: Ravi Teja Date: Wed, 28 Jul 2021 23:46:44 -0500 Subject: Add D-bus monitor snmp policy for ibm systems This commit is add D-bus monitor config.yaml for errorlog entries for snmp eventing. Tested by: Configured SNMP and created errorlog observed snmp traps recieved on SNMP server Signed-off-by: Ravi Teja Change-Id: I59c1f8a3b03eb3aab4a55c3cfb0bfb3e9e600a4d --- .../recipes-phosphor/dbus/events-policy/config.yaml | 19 ------------------- .../dbus/phosphor-dbus-monitor-config.bbappend | 3 +++ meta-ibm/recipes-phosphor/dbus/snmp-policy.bb | 17 +++++++++++++++++ .../dbus/snmp-policy/snmp-config.yaml | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/dbus/snmp-policy.bb create mode 100644 meta-ibm/recipes-phosphor/dbus/snmp-policy/snmp-config.yaml (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml index 5c62d45a3..0d31afb2b 100644 --- a/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml +++ b/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml @@ -112,22 +112,3 @@ properties: occmemtemp property eventName: occ eventMessage: "Memory throttled due to an over temperature condition." - -- name: errorlog path group - class: group - group: path - members: - - meta: PATH - path: /xyz/openbmc_project/logging - -- name: pathwatch errorlog - class: pathwatch - pathwatch: path - paths: errorlog path group - pathcallback: create errorlog trap - -- name: create errorlog trap - class: pathcallback - pathcallback: eventpath - paths: errorlog path group - eventType: ErrorTrap diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 3a18960ea..8437cba8f 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -2,7 +2,10 @@ PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " snmp-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " fan-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " thermal-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " power-supply-policy" PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " events-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " snmp-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_p10bmc = " snmp-policy" diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb new file mode 100644 index 000000000..500c674dc --- /dev/null +++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb @@ -0,0 +1,17 @@ +SUMMARY = "snmp policy configuration for meta-ibm machines" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-dbus-monitor + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://snmp-config.yaml" + +do_install() { + install -D ${WORKDIR}/snmp-config.yaml ${D}${config_dir}/snmp-config.yaml +} + +FILES_${PN} += "${config_dir}/snmp-config.yaml" diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy/snmp-config.yaml b/meta-ibm/recipes-phosphor/dbus/snmp-policy/snmp-config.yaml new file mode 100644 index 000000000..a168bde3f --- /dev/null +++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy/snmp-config.yaml @@ -0,0 +1,18 @@ +- name: errorlog path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/logging + +- name: pathwatch errorlog + class: pathwatch + pathwatch: path + paths: errorlog path group + pathcallback: create errorlog trap + +- name: create errorlog trap + class: pathcallback + pathcallback: eventpath + paths: errorlog path group + eventType: ErrorTrap -- cgit v1.2.3 From b96c75046da8f72359d101c813f0694409bbe0d1 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Fri, 6 Aug 2021 16:25:30 +0000 Subject: meta-ibm: prep for new override syntax Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba Signed-off-by: Adriana Kobylak --- meta-ibm/conf/layer.conf | 2 +- meta-ibm/conf/local.conf.sample | 2 +- meta-ibm/conf/machine/mihawk.conf | 12 +-- meta-ibm/conf/machine/p10bmc.conf | 10 +-- meta-ibm/conf/machine/swift.conf | 2 +- meta-ibm/conf/machine/witherspoon-tacoma.conf | 10 +-- meta-ibm/conf/machine/witherspoon.conf | 6 +- meta-ibm/meta-fsp2/conf/machine/sunray2.conf | 2 +- .../meta-fsp2/recipes-kernel/linux/linux-fsp2.inc | 4 +- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/local.conf.sample | 6 +- meta-ibm/meta-palmetto/conf/machine/palmetto.conf | 2 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../configuration/palmetto-yaml-config.bb | 4 +- .../console/obmc-console_%.bbappend | 2 +- .../host/checkstop-monitor.bbappend | 2 +- .../images/obmc-phosphor-image.bbappend | 2 +- .../inventory/inventory-cleanup.bb | 2 +- .../phosphor-inventory-manager_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +- .../ipmi/phosphor-ipmi-host_%.bbappend | 4 +- .../recipes-phosphor/mrw/mrw-native_%.bbappend | 4 +- .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +- .../skeleton/obmc-libobmc-intf_%.bbappend | 2 +- meta-ibm/meta-romulus/conf/layer.conf | 2 +- meta-ibm/meta-romulus/conf/local.conf.sample | 6 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 4 +- .../recipes-phosphor/chassis/avsbus-control.bb | 6 +- .../recipes-phosphor/chassis/vrm-control.bb | 4 +- .../configuration/romulus-yaml-config.bb | 4 +- .../console/obmc-console_%.bbappend | 2 +- .../phosphor-fan-control-events-config.bbappend | 2 +- .../fans/phosphor-fan-control-fan-config.bbappend | 2 +- .../fans/phosphor-fan-control-zone-config.bbappend | 2 +- .../fans/phosphor-fan-monitor-config.bbappend | 2 +- .../fans/phosphor-fan-presence-config.bbappend | 2 +- .../flash/phosphor-software-manager_%.bbappend | 2 +- .../recipes-phosphor/gpio/id-button.bb | 4 +- .../recipes-phosphor/host/p9-host-start.bbappend | 4 +- .../images/obmc-phosphor-image.bbappend | 2 +- .../inventory/inventory-cleanup.bb | 2 +- .../phosphor-inventory-manager_%.bbappend | 2 +- .../ipmi/openpower-ipmi-oem_%.bbappend | 4 +- .../ipmi/phosphor-ipmi-config.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +- .../ipmi/phosphor-ipmi-host_%.bbappend | 4 +- .../recipes-phosphor/mboxd/mboxd_%.bbappend | 2 +- .../packagegroups/packagegroup-obmc-apps.bbappend | 4 +- .../sensors/phosphor-hwmon_%.bbappend | 8 +- .../skeleton/obmc-libobmc-intf_%.bbappend | 2 +- .../state/phosphor-state-manager_%.bbappend | 4 +- meta-ibm/recipes-core/systemd/systemd_%.bbappend | 30 ++++---- meta-ibm/recipes-extended/sudo/sudo_%.bbappend | 2 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 8 +- .../phosphor-certificate-manager_%.bbappend | 4 +- .../recipes-phosphor/chassis/avsbus-control.bb | 12 +-- .../chassis/obmc-op-control-power_%.bbappend | 2 +- .../recipes-phosphor/chassis/power-workarounds.bb | 4 +- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 12 +-- .../configuration/acx22-yaml-config.bb | 12 +-- .../console/obmc-console_%.bbappend | 36 ++++----- meta-ibm/recipes-phosphor/dbus/events-policy.bb | 4 +- meta-ibm/recipes-phosphor/dbus/fan-policy.bb | 22 +++--- .../ibm-dbus-interfaces-mapper-config-native.bb | 4 +- .../dbus/ibm-dbus-interfaces_git.bb | 4 +- .../dbus/phosphor-dbus-monitor-config.bbappend | 22 +++--- .../dbus/phosphor-dbus-monitor_%.bbappend | 4 +- .../dbus/phosphor-mapper-config-native.bbappend | 2 +- .../recipes-phosphor/dbus/power-supply-policy.bb | 4 +- meta-ibm/recipes-phosphor/dbus/snmp-policy.bb | 2 +- meta-ibm/recipes-phosphor/dbus/thermal-policy.bb | 4 +- .../dump/phosphor-debug-collector_%.bbappend | 12 +-- meta-ibm/recipes-phosphor/fans/fan-watchdog.bb | 6 +- .../phosphor-fan-control-events-config.bbappend | 2 +- .../fans/phosphor-fan-control-fan-config.bbappend | 2 +- ...hor-fan-control-zone-conditions-config.bbappend | 2 +- .../fans/phosphor-fan-control-zone-config.bbappend | 2 +- .../fans/phosphor-fan-monitor-config.bbappend | 24 +++--- .../fans/phosphor-fan-presence-config.bbappend | 24 +++--- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 88 +++++++++++----------- .../flash/openpower-software-manager_%.bbappend | 4 +- .../flash/phosphor-software-manager_%.bbappend | 28 +++---- meta-ibm/recipes-phosphor/gpio/id-button.bb | 4 +- .../gpio/phosphor-gpio-monitor_%.bbappend | 10 +-- .../recipes-phosphor/host/p9-host-start.bbappend | 10 +-- .../host/phosphor-host-postd_%.bbappend | 4 +- .../images/obmc-phosphor-image.bbappend | 14 ++-- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 2 +- .../inventory/inventory-cleanup.bb | 2 +- .../phosphor-inventory-manager_%.bbappend | 16 ++-- .../ipmi/openpower-ipmi-oem_%.bbappend | 8 +- .../ipmi/phosphor-ipmi-config.bbappend | 4 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 8 +- .../ipmi/phosphor-ipmi-host_%.bbappend | 8 +- .../ipmi/phosphor-ipmi-net_%.bbappend | 4 +- .../recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb | 6 +- .../leds/phosphor-led-manager_%.bbappend | 16 ++-- .../recipes-phosphor/logging/ibm-logging_git.bb | 6 +- .../logging/phosphor-logging_%.bbappend | 22 +++--- meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend | 14 ++-- meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend | 10 +-- .../network/phosphor-network_%.bbappend | 24 +++--- .../recipes-phosphor/openssl/openssl_%.bbappend | 4 +- .../packagegroups/packagegroup-obmc-apps.bbappend | 40 +++++----- meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 4 +- .../power/phosphor-power_%.bbappend | 24 +++--- meta-ibm/recipes-phosphor/power/power-sequencer.bb | 12 +-- ...witherspoon-pfault-analysis-error-native_git.bb | 2 +- .../power/witherspoon-power-supply-sync.bb | 4 +- .../sensors/dbus-sensors_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 68 ++++++++--------- .../sensors/phosphor-virtual-sensor_%.bbappend | 4 +- .../settings/phosphor-settings-manager_%.bbappend | 14 ++-- ...phor-settings-read-settings-mrw-native.bbappend | 2 +- .../skeleton/obmc-libobmc-intf_%.bbappend | 2 +- .../state/phosphor-post-code-manager_%.bbappend | 4 +- .../state/phosphor-state-manager_%.bbappend | 6 +- .../vpd/openpower-fru-vpd_%.bbappend | 6 +- .../watchdog/phosphor-watchdog_%.bbappend | 4 +- 120 files changed, 483 insertions(+), 483 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index e8824c853..95c571be6 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott honister" diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 0166b9520..9680cf03b 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -4,7 +4,7 @@ MACHINE ??= "witherspoon" DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index 2bb67ed08..932ed5e7b 100644 --- a/meta-ibm/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -25,20 +25,20 @@ PHOSPHOR_MRW_REV = "f6ec5aa0f9803d44b147a7670dec7ec935f59582" # Inhibit phosphor-hwmon-config-mrw -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = "" # Inhibit phosphor-fan-presence-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ "phosphor-fan-presence-config" # Inhibit phosphor-fan-control-fan-config-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" # Inhibit mihawk-led-manager-config-native -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \ "mihawk-led-manager-config-native" -PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" +PREFERRED_PROVIDER_virtual/phosphor-logging-callouts:df-mrw = "mihawk-phosphor-logging-callouts-native" -PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native" +PREFERRED_PROVIDER_virtual/openpower-fru-inventory:df-mrw = "mihawk-openpower-fru-inventory-native" diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 49a0bdbd9..2b7463e28 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -24,16 +24,16 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = "" -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ "phosphor-fan-presence-config" SKIP_BROKEN_MRW = "1" -IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-ikvm" UBOOT_SIGN_ENABLE = "1" SPL_SIGN_ENABLE = "1" @@ -56,4 +56,4 @@ UBOOT_SIGN_KEYDIR = "${WORKDIR}" SPL_SIGN_KEYDIR = "${WORKDIR}" DEBUG_TRIGGERS = "kcs2" -PACKAGECONFIG_append_pn-debug-trigger = " triggers" +PACKAGECONFIG:append:pn-debug-trigger = " triggers" diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf index e8d6dcc90..f4f241395 100644 --- a/meta-ibm/conf/machine/swift.conf +++ b/meta-ibm/conf/machine/swift.conf @@ -18,5 +18,5 @@ FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" BMC_RW_SIZE = "0x2000000" # Inhibit swift-led-manager-config-native -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \ "swift-led-manager-config-native" diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 7860e3eba..bf10d16ae 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -24,11 +24,11 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = "" -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ "phosphor-fan-presence-config" # The eMMC on Tacoma is just 1GB smaller than Rainier. The template file @@ -38,7 +38,7 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ # partition is 5GB, therefore setting it to 4GB for Tacoma. WKS_HOSTFW_SIZE = "4G" -IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-ikvm" DEBUG_TRIGGERS = "kcs2" -PACKAGECONFIG_append_pn-debug-trigger = " triggers" +PACKAGECONFIG:append:pn-debug-trigger = " triggers" diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 08f2935f9..42844c1cc 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -23,12 +23,12 @@ PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" # Inhibit phosphor-hwmon-config-mrw -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = "" # Inhibit phosphor-fan-presence-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ "phosphor-fan-presence-config" # Inhibit phosphor-fan-control-fan-config-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" diff --git a/meta-ibm/meta-fsp2/conf/machine/sunray2.conf b/meta-ibm/meta-fsp2/conf/machine/sunray2.conf index dd21344f3..2c6d30988 100644 --- a/meta-ibm/meta-fsp2/conf/machine/sunray2.conf +++ b/meta-ibm/meta-fsp2/conf/machine/sunray2.conf @@ -4,7 +4,7 @@ KBUILD_DEFCONFIG = "44x/fsp2_defconfig" require conf/machine/include/fsp2.inc -UBOOT_MACHINE_sunray2 = "fsp2_defconfig" +UBOOT_MACHINE:sunray2 = "fsp2_defconfig" UBOOT_ENTRYPOINT = "0x10000000" UBOOT_LOADADDRESS = "0x10000000" diff --git a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc index 37ae6abeb..8a853c357 100644 --- a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc +++ b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc @@ -15,7 +15,7 @@ COMPATIBLE_MACHINE_${MACHINE} = "^${MACHINE}$" KERNEL_CLASSES ?= "kernel-uimage" KERNEL_IMAGETYPE ?= "uImage" -do_patch_append() { +do_patch:append() { for DTB in "${KERNEL_DEVICETREE}"; do DT=`basename ${DTB} .dtb` if [ -r "${WORKDIR}/${DT}.dts" ]; then @@ -28,4 +28,4 @@ do_patch_append() { inherit kernel require recipes-kernel/linux/linux-yocto.inc -INSANE_SKIP_kernel-vmlinux = "ldflags" +INSANE_SKIP:kernel-vmlinux = "ldflags" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index 9f2df6365..f40a9511d 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott honister" diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample index 3bdab8196..e25c4d912 100644 --- a/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -115,7 +115,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults @@ -226,8 +226,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index 9e1c123ae..6f0e905cc 100644 --- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -6,7 +6,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p8.inc -UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config" +UBOOT_MACHINE:palmetto = "ast_g4_ncsi_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend index 6cdb95135..62a07f4f7 100644 --- a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" SRC_URI += "file://palmetto.cfg" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb index 44b47604d..c5c5bfdd5 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb +++ b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb @@ -22,10 +22,10 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend index 755346060..6e76d4a96 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_palmetto = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL:append:palmetto = " mboxd" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb index 0c4b56f72..1b5a119b1 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb @@ -14,4 +14,4 @@ do_install() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index d552f5763..7445c4e9e 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1 +1 @@ -DEPENDS_append = " inventory-cleanup" +DEPENDS:append = " inventory-cleanup" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index b69c6e109..cbd265e59 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_palmetto = " palmetto-yaml-config" +DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF_palmetto = " \ +EXTRA_OECONF:palmetto = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index db33e2886..5c0f8f783 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_palmetto = " palmetto-yaml-config" +DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF_palmetto = " \ +EXTRA_OECONF:palmetto = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend index b5ea3704a..c08c48507 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" -SRC_URI_append_palmetto = " file://palmetto.xml.patch.xml" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" +SRC_URI:append:palmetto = " file://palmetto.xml.patch.xml" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 52b9468cc..74635eac1 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-inventory_append_palmetto = " openpower-occ-control phosphor-webui" +RDEPENDS:${PN}-inventory:append:palmetto = " openpower-occ-control phosphor-webui" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index bff849791..13b8535a5 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" NAMES = " \ bus@1e78a000/i2c-bus@40/rtc@68 \ @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index 2c176f432..efeb24a95 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott honister" diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample index 17233dff9..c5e363b95 100644 --- a/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-ibm/meta-romulus/conf/local.conf.sample @@ -93,7 +93,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -204,8 +204,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#PACKAGECONFIG:append:pn-qemu-native = " sdl" +#PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend index 664d7e114..b97800952 100644 --- a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" -SRC_URI_append_romulus = " file://romulus.cfg" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" +SRC_URI:append:romulus = " file://romulus.cfg" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index f7ed43038..52fc793ac 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools bash" +RDEPENDS:${PN} += "i2c-tools bash" S = "${WORKDIR}" SRC_URI += "file://avsbus-enable.sh \ @@ -27,7 +27,7 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" -SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" +SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_DIS}" +SYSTEMD_SERVICE:${PN} += "${TMPL_DIS}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index f0e6eb0ea..7981baa0c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools bash" +RDEPENDS:${PN} += "i2c-tools bash" S = "${WORKDIR}" SRC_URI += "file://vrm-control.sh \ @@ -23,5 +23,5 @@ INSTFMT = "vrm-control@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_SERVICE:${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/configuration/romulus-yaml-config.bb b/meta-ibm/meta-romulus/recipes-phosphor/configuration/romulus-yaml-config.bb index 026471f7e..3638f709c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/configuration/romulus-yaml-config.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/configuration/romulus-yaml-config.bb @@ -28,11 +28,11 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend index 4db6f3a6d..451d82089 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend index 781af4fcf..b100be794 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend index 781af4fcf..b100be794 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend index 83b54c418..457d039e4 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 781af4fcf..b100be794 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index 781af4fcf..b100be794 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 18f76ee3a..1aaafb5bb 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_romulus = " verify_signature" +PACKAGECONFIG:append:romulus = " verify_signature" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 6251786c3..3cbf82408 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd DEPENDS += "virtual/obmc-gpio-monitor" -RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" S = "${WORKDIR}" SRC_URI += "file://toggle_identify_led.sh" @@ -26,5 +26,5 @@ INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "id-button-pressed.service" +SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend index bc7e02ea0..43497f33b 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend @@ -1,2 +1,2 @@ -RDEPENDS_${PN}_append_romulus = " avsbus-control" -RDEPENDS_${PN}_append_romulus = " vrm-control" +RDEPENDS:${PN}:append:romulus = " avsbus-control" +RDEPENDS:${PN}:append:romulus = " vrm-control" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend index ccf7b4582..ef87ad804 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_romulus = " mboxd liberation-fonts uart-render-controller" +OBMC_IMAGE_EXTRA_INSTALL:append:romulus = " mboxd liberation-fonts uart-render-controller" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb index 0c4b56f72..1b5a119b1 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup.bb @@ -14,4 +14,4 @@ do_install() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index d552f5763..7445c4e9e 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1 +1 @@ -DEPENDS_append = " inventory-cleanup" +DEPENDS:append = " inventory-cleanup" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index 73c50cf25..ad060bf7f 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -1,5 +1,5 @@ -DEPENDS_append_romulus = " romulus-yaml-config" +DEPENDS:append:romulus = " romulus-yaml-config" -EXTRA_OECONF_romulus = " \ +EXTRA_OECONF:romulus = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 4db6f3a6d..451d82089 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 79df7f399..bbdd2b241 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_romulus = " romulus-yaml-config" +DEPENDS:append:romulus = " romulus-yaml-config" -EXTRA_OECONF_romulus = " \ +EXTRA_OECONF:romulus = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 25130a586..7a27e223d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_romulus = " romulus-yaml-config" +DEPENDS:append:romulus = " romulus-yaml-config" -EXTRA_OECONF_romulus = " \ +EXTRA_OECONF:romulus = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend index 566fc6c34..4e1ac7544 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1 +1 @@ -MBOXD_FLASH_SIZE_romulus = "64M" +MBOXD_FLASH_SIZE:romulus = "64M" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 6380ac256..69588edb0 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,2 @@ -RDEPENDS_${PN}-inventory_append_romulus = " openpower-occ-control id-button" -RDEPENDS_${PN}-extras_append_romulus = " phosphor-webui phosphor-image-signing" +RDEPENDS:${PN}-inventory:append:romulus = " openpower-occ-control id-button" +RDEPENDS:${PN}-extras:append:romulus = " phosphor-webui phosphor-image-signing" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 3aba6bbb8..e3d012247 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_romulus = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:romulus = " -Dnegative-errno-on-fail=true" CHIPS = " \ bus@1e78a000/i2c-bus@440/w83773g@4c \ @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 4db6f3a6d..451d82089 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 308c73189..11a2b498b 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" -EXTRA_OEMESON_romulus += "-Dwarm-reboot=disabled" +EXTRA_OEMESON:romulus += "-Dwarm-reboot=disabled" diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index 3e490153d..b61d9306d 100644 --- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend @@ -1,26 +1,26 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf" -SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf" -SRC_URI_append_ibm-ac-server = " file://journald-size-policy-2MB.conf" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:ibm-ac-server = " file://journald-storage-policy.conf" +SRC_URI:append:ibm-ac-server = " file://systemd-journald-override.conf" +SRC_URI:append:ibm-ac-server = " file://journald-size-policy-2MB.conf" -SRC_URI_append_p10bmc = " file://journald-storage-policy.conf" -SRC_URI_append_p10bmc = " file://systemd-journald-override.conf" -SRC_URI_append_p10bmc = " file://journald-size-policy-16MB.conf" +SRC_URI:append:p10bmc = " file://journald-storage-policy.conf" +SRC_URI:append:p10bmc = " file://systemd-journald-override.conf" +SRC_URI:append:p10bmc = " file://journald-size-policy-16MB.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" -FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" -FILES_${PN}_append_p10bmc = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" -FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES:${PN}:append:p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES:${PN}:append:p10bmc = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES:${PN}:append:p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-2MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-16MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf diff --git a/meta-ibm/recipes-extended/sudo/sudo_%.bbappend b/meta-ibm/recipes-extended/sudo/sudo_%.bbappend index f4254e7ba..338df396a 100644 --- a/meta-ibm/recipes-extended/sudo/sudo_%.bbappend +++ b/meta-ibm/recipes-extended/sudo/sudo_%.bbappend @@ -2,7 +2,7 @@ PACKAGECONFIG += "pam-wheel" -do_install_append () { +do_install:append () { # Allow members of the 'wheel' group to use passwordless sudo sed -i 's/# \(%wheel ALL=(ALL) NOPASSWD: ALL\)/\1/' ${D}${sysconfdir}/sudoers } diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend index 5ba22e3a7..033623aed 100644 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" -SRC_URI_append_p10bmc = " file://p10bmc.cfg" -SRC_URI_append_mihawk = " file://mihawk.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:ibm-ac-server = " file://witherspoon.cfg" +SRC_URI:append:p10bmc = " file://p10bmc.cfg" +SRC_URI:append:mihawk = " file://mihawk.cfg" diff --git a/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend index ee6b1893c..ab4f0484f 100644 --- a/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_p10bmc = " ibm-hypervisor-cert" -PACKAGECONFIG_append_witherspoon-tacoma = " ibm-hypervisor-cert" +PACKAGECONFIG:append:p10bmc = " ibm-hypervisor-cert" +PACKAGECONFIG:append:witherspoon-tacoma = " ibm-hypervisor-cert" diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index 2e98aaf90..c46926f90 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -6,19 +6,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" SRC_URI += "file://avsbus-enable.sh" -SRC_URI_append_witherspoon = " file://avsbus-disable.sh" +SRC_URI:append:witherspoon = " file://avsbus-disable.sh" do_install() { install -d ${D}${bindir} install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh } -do_install_append_witherspoon() { +do_install:append:witherspoon() { install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh } @@ -30,7 +30,7 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" -SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" +SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN}_append_witherspoon = " ${TMPL_DIS}" -SYSTEMD_LINK_${PN}_append_witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" +SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index af8babb53..2d00264dc 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" @@ -22,5 +22,5 @@ INSTFMT_WA = "power-workarounds@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" -SYSTEMD_SERVICE_${PN} += "${TMPL_WA}" +SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a0d7a6eb..8a9ef7fae 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools bash" +RDEPENDS:${PN} += "i2c-tools bash" S = "${WORKDIR}" SRC_URI = "file://ir35221-unbind-bind.sh" -SRC_URI_append_ibm-ac-server = " file://vrm-control.sh" +SRC_URI:append:ibm-ac-server = " file://vrm-control.sh" do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/ir35221-unbind-bind.sh ${D}${bindir}/ir35221-unbind-bind.sh } -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -m 0755 ${WORKDIR}/vrm-control.sh ${D}${bindir}/vrm-control.sh } @@ -35,8 +35,8 @@ TMPL_ON_IRUNBIND = "ir35221-on-unbind@.service" INSTFMT_ON_IRUNBIND = "ir35221-on-unbind@{0}.service" FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRUNBIND}" -SYSTEMD_SERVICE_${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ${TMPL}" -SYSTEMD_LINK_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" +SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}" +SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb index 5ec7d4565..3a01fe1ae 100644 --- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit mrw-xml -SRC_URI_ibm-ac-server = " \ +SRC_URI:ibm-ac-server = " \ file://acx22-ipmi-fru-bmc.yaml \ file://acx22-ipmi-fru-not-sent-by-host.yaml \ file://acx22-ipmi-hwmon-sensors.yaml \ @@ -14,7 +14,7 @@ SRC_URI_ibm-ac-server = " \ file://acx22-ipmi-occ-sensors.yaml \ file://acx22-ipmi-sensors-mrw.yaml \ " -SRC_URI_mihawk = " \ +SRC_URI:mihawk = " \ file://acx22-ipmi-fru-bmc.yaml \ file://acx22-ipmi-hwmon-sensors.yaml \ file://acx22-ipmi-inventory-sensors.yaml \ @@ -29,11 +29,11 @@ DEPENDS = " \ S = "${WORKDIR}" -ACx22_IPMI_EXTRA_FRU_READ_YAMLS_ibm-ac-server = " \ +ACx22_IPMI_EXTRA_FRU_READ_YAMLS:ibm-ac-server = " \ acx22-ipmi-fru-bmc.yaml \ acx22-ipmi-fru-not-sent-by-host.yaml \ " -ACx22_IPMI_EXTRA_FRU_READ_YAMLS_mihawk = " \ +ACx22_IPMI_EXTRA_FRU_READ_YAMLS:mihawk = " \ acx22-ipmi-fru-bmc.yaml \ " ACx22_IPMI_EXTRA_SENSOR_YAMLS = " \ @@ -82,11 +82,11 @@ do_install() { install -m 0644 -D sensors.yaml ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index f493ef5a0..9360e2128 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_remove = "file://${BPN}.conf" +SRC_URI:remove = "file://${BPN}.conf" SRC_URI += "file://server.ttyVUART0.conf" install_concurrent_console_config() { @@ -27,38 +27,38 @@ install_concurrent_console_config() { install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/ } -SRC_URI_append_p10bmc = " file://client.2201.conf" -SRC_URI_append_p10bmc = " file://server.ttyVUART1.conf" +SRC_URI:append:p10bmc = " file://client.2201.conf" +SRC_URI:append:p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}_append_p10bmc = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES_${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" -SYSTEMD_SERVICE_${PN}_append_p10bmc = " obmc-console-ssh@2200.service \ +SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ " -SYSTEMD_SERVICE_${PN}_remove_p10bmc = "obmc-console-ssh.socket" +SYSTEMD_SERVICE:${PN}:remove:p10bmc = "obmc-console-ssh.socket" -FILES_${PN}_remove_p10bmc = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" +FILES:${PN}:remove:p10bmc = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF_append_p10bmc = " --enable-concurrent-servers" +EXTRA_OECONF:append:p10bmc = " --enable-concurrent-servers" -do_install_append_p10bmc() { +do_install:append:p10bmc() { install_concurrent_console_config } -SRC_URI_append_witherspoon-tacoma = " file://client.2201.conf" -SRC_URI_append_witherspoon-tacoma = " file://server.ttyVUART1.conf" +SRC_URI:append:witherspoon-tacoma = " file://client.2201.conf" +SRC_URI:append:witherspoon-tacoma = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}_append_witherspoon-tacoma = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES_${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" -SYSTEMD_SERVICE_${PN}_append_witherspoon-tacoma = " obmc-console-ssh@2200.service \ +SYSTEMD_SERVICE:${PN}:append:witherspoon-tacoma = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ " -SYSTEMD_SERVICE_${PN}_remove_witherspoon-tacoma = "obmc-console-ssh.socket" +SYSTEMD_SERVICE:${PN}:remove:witherspoon-tacoma = "obmc-console-ssh.socket" -FILES_${PN}_remove_witherspoon-tacoma = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" +FILES:${PN}:remove:witherspoon-tacoma = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF_append_witherspoon-tacoma = " --enable-concurrent-servers" +EXTRA_OECONF:append:witherspoon-tacoma = " --enable-concurrent-servers" -do_install_append_witherspoon-tacoma() { +do_install:append:witherspoon-tacoma() { install_concurrent_console_config } diff --git a/meta-ibm/recipes-phosphor/dbus/events-policy.bb b/meta-ibm/recipes-phosphor/dbus/events-policy.bb index 52cb31313..676466b53 100644 --- a/meta-ibm/recipes-phosphor/dbus/events-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/events-policy.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://config.yaml" @@ -14,4 +14,4 @@ do_install() { install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml } -FILES_${PN} += "${config_dir}/config.yaml" +FILES:${PN} += "${config_dir}/config.yaml" diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb index 8bfecd32f..f54272593 100644 --- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb @@ -6,29 +6,29 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://air-cooled.yaml" -SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml" +SRC_URI:append:ibm-ac-server = " file://water-cooled.yaml" SRC_URI += "file://fan-errors.yaml" -SRC_URI_remove_p10bmc = "file://air-cooled.yaml" -SRC_URI_remove_p10bmc = "file://fan-errors.yaml" +SRC_URI:remove:p10bmc = "file://air-cooled.yaml" +SRC_URI:remove:p10bmc = "file://fan-errors.yaml" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml } -do_install_append_mihawk() { +do_install:append:mihawk() { install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml } -FILES_${PN} += "${config_dir}/air-cooled.yaml" -FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml" -FILES_${PN} += "${config_dir}/fan-errors.yaml" +FILES:${PN} += "${config_dir}/air-cooled.yaml" +FILES:${PN}:append:ibm-ac-server = " ${config_dir}/water-cooled.yaml" +FILES:${PN} += "${config_dir}/fan-errors.yaml" -FILES_${PN}_remove_p10bmc = "${config_dir}/air-cooled.yaml" -FILES_${PN}_remove_p10bmc = "${config_dir}/fan-errors.yaml" +FILES:${PN}:remove:p10bmc = "${config_dir}/air-cooled.yaml" +FILES:${PN}:remove:p10bmc = "${config_dir}/fan-errors.yaml" diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb index b8489d670..14c125543 100644 --- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb +++ b/meta-ibm/recipes-phosphor/dbus/ibm-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.ibm" -PHOSPHOR_MAPPER_INTERFACE_append = " com.ibm" +PHOSPHOR_MAPPER_SERVICE:append = " com.ibm" +PHOSPHOR_MAPPER_INTERFACE:append = " com.ibm" diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb index 99b933ab7..f8b3da2a5 100644 --- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb +++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb @@ -25,7 +25,7 @@ PACKAGECONFIG[libibm_dbus] = " \ libsystemd \ " -PACKAGECONFIG_remove_class-native = "libibm_dbus" -PACKAGECONFIG_remove_class-nativesdk = "libibm_dbus" +PACKAGECONFIG:remove:class-native = "libibm_dbus" +PACKAGECONFIG:remove:class-nativesdk = "libibm_dbus" BBCLASSEXTEND += "native nativesdk" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 8437cba8f..7ed24ff14 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -1,11 +1,11 @@ -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " snmp-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " fan-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " thermal-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " power-supply-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " events-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " snmp-policy" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_p10bmc = " snmp-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " fan-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " thermal-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " power-supply-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " events-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " snmp-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " fan-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " thermal-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " power-supply-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " events-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " snmp-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:p10bmc = " snmp-policy" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 5c9d0b15c..3071cb4c9 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,2 @@ -SYSTEMD_LINK_phosphor-msl-verify_append_ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" -SYSTEMD_LINK_phosphor-msl-verify_append_mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend index d94a55490..25ab376fb 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend @@ -1 +1 @@ -PHOSPHOR_MAPPER_CONFIGS_append = " ibm-dbus-interfaces-mapper-config-native" +PHOSPHOR_MAPPER_CONFIGS:append = " ibm-dbus-interfaces-mapper-config-native" diff --git a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb index 8d3df4600..b55efb377 100644 --- a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://power-supply-policy.yaml" @@ -14,4 +14,4 @@ do_install() { install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml } -FILES_${PN} += "${config_dir}/power-supply-policy.yaml" +FILES:${PN} += "${config_dir}/power-supply-policy.yaml" diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb index 500c674dc..94fce404a 100644 --- a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://snmp-config.yaml" diff --git a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb index b5b38baa3..5c381b46c 100644 --- a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI = "file://thermal-policy.yaml" @@ -14,4 +14,4 @@ do_install() { install -D ${WORKDIR}/thermal-policy.yaml ${D}${config_dir}/thermal-policy.yaml } -FILES_${PN} += "${config_dir}/thermal-policy.yaml" +FILES:${PN} += "${config_dir}/thermal-policy.yaml" diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 0cbca65aa..ec831eb5f 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -PACKAGECONFIG_append_p10bmc = " host-dump-transport-pldm" -PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-transport-pldm" +PACKAGECONFIG:append:p10bmc = " host-dump-transport-pldm" +PACKAGECONFIG:append:witherspoon-tacoma = " host-dump-transport-pldm" -PACKAGECONFIG_append_p10bmc = " openpower-dumps-extension" -PACKAGECONFIG_append_witherspoon-tacoma = " openpower-dumps-extension" +PACKAGECONFIG:append:p10bmc = " openpower-dumps-extension" +PACKAGECONFIG:append:witherspoon-tacoma = " openpower-dumps-extension" SRC_URI += "file://plugins.d/ibm_elogall" SRC_URI += "file://plugins.d/pels" @@ -47,6 +47,6 @@ python link_ibm_bad_vpd() { } IBM_INSTALL_POSTFUNCS = "install_ibm_plugins link_ibm_plugins" -IBM_INSTALL_POSTFUNCS_p10bmc += "install_dreport_header install_ibm_bad_vpd link_ibm_bad_vpd" +IBM_INSTALL_POSTFUNCS:p10bmc += "install_dreport_header install_ibm_bad_vpd link_ibm_bad_vpd" do_install[postfuncs] += "${IBM_INSTALL_POSTFUNCS}" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index d71b378cf..ad44ba346 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" -RDEPENDS_${PN} += "busybox" +RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "busybox" RESET_SERVICE = "reset-fan-watchdog.service" TGTFMT = "obmc-chassis-poweron@0.target" @@ -17,7 +17,7 @@ MONITOR_SERVICE = "fan-watchdog-monitor@.service" WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" -SYSTEMD_SERVICE_${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" +SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend index 8f2097cc1..9accc57ef 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend index 8f2097cc1..9accc57ef 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend index 8f2097cc1..9accc57ef 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend index 8f2097cc1..9accc57ef 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 2c15e034a..85cc4d82e 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1,18 +1,18 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_witherspoon = "file://config.json" -SRC_URI_p10bmc = "file://rainier-2u/config.json \ +SRC_URI:witherspoon = "file://config.json" +SRC_URI:p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ file://rainier-1s4u/config.json \ file://everest/config.json \ " -do_install_witherspoon() { +do_install:witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ } -do_install_p10bmc() { +do_install:p10bmc() { # Install Rainier-2U/4U fan monitor config files install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ @@ -26,11 +26,11 @@ do_install_p10bmc() { install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ } -FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" -FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml" +FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" +FILES:${PN}:remove:witherspoon = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" +FILES:${PN}:remove:p10bmc = "${monitor_datadir}/monitor.yaml" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index 2306ee509..64dbc758b 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_witherspoon = "file://config.json" -SRC_URI_p10bmc = "file://rainier-2u/config.json \ +SRC_URI:witherspoon = "file://config.json" +SRC_URI:p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ file://rainier-1s4u/config.json \ file://everest/config.json \ " -do_install_witherspoon() { +do_install:witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/presence/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ } -do_install_p10bmc() { +do_install:p10bmc() { # Install Rainier-2U/4U fan presence config files install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ @@ -25,11 +25,11 @@ do_install_p10bmc() { install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ } -FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" -FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml" +FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" +FILES:${PN}:remove:witherspoon = "${presence_datadir}/config.yaml" -FILES_${PN}_remove_p10bmc = "${presence_datadir}/config.yaml" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json" -FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" +FILES:${PN}:remove:p10bmc = "${presence_datadir}/config.yaml" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json" +FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 0d8b3b872..8b4e91e93 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,74 +1,74 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Package configuration -FAN_PACKAGES_append_ibm-ac-server = " \ +FAN_PACKAGES:append:ibm-ac-server = " \ phosphor-cooling-type \ " -FAN_PACKAGES_append_mihawk = " \ +FAN_PACKAGES:append:mihawk = " \ phosphor-cooling-type \ " -PACKAGECONFIG_append_ibm-ac-server = " cooling-type" -PACKAGECONFIG_append_mihawk = " cooling-type" +PACKAGECONFIG:append:ibm-ac-server = " cooling-type" +PACKAGECONFIG:append:mihawk = " cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" MULTI_USR_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}" -FILES_phosphor-cooling-type_append_ibm-ac-server = " ${bindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type_append_ibm-ac-server = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" -FILES_phosphor-cooling-type_append_mihawk = " ${bindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type_append_mihawk = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type_append_mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type" +SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}" +SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type" +SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}" +SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service -SYSTEMD_SERVICE_${PN}-control_witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" +SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby -FMT_CONTROL_STDBY_witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" +FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" +SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to also start at poweron -FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" +FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" +SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it -PACKAGECONFIG_append_witherspoon = " json" -EXTRA_OECONF_append_witherspoon = " --disable-json-control" -RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" -RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" +PACKAGECONFIG:append:witherspoon = " json" +EXTRA_OECONF:append:witherspoon = " --disable-json-control" +RDEPENDS:${PN}-presence-tach:append:witherspoon = " phosphor-fan-presence-config" +RDEPENDS:${PN}-monitor:append:witherspoon = " phosphor-fan-monitor-config" -PACKAGECONFIG_append_p10bmc = " json sensor-monitor" -FAN_PACKAGES_append_p10bmc = " sensor-monitor" -RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config" -RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config" +PACKAGECONFIG:append:p10bmc = " json sensor-monitor" +FAN_PACKAGES:append:p10bmc = " sensor-monitor" +RDEPENDS:${PN}-presence-tach:append:p10bmc = " phosphor-fan-presence-config" +RDEPENDS:${PN}-monitor:append:p10bmc = " phosphor-fan-monitor-config" # Install fan control JSON config files -SRC_URI_append_p10bmc = " \ +SRC_URI:append:p10bmc = " \ file://manager.json \ file://rainier/fans.json \ file://rainier-1s4u/fans.json \ @@ -77,7 +77,7 @@ SRC_URI_append_p10bmc = " \ file://rainier-1s4u/zones.json \ file://everest/fans.json \ file://everest/zones.json" -do_install_append_p10bmc() { +do_install:append:p10bmc() { # Install fan control manager config file install -d ${D}/${datadir}/phosphor-fan-presence/control/ install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/ @@ -100,7 +100,7 @@ do_install_append_p10bmc() { install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ } -FILES_${PN}-control_append_p10bmc = " \ +FILES:${PN}-control:append:p10bmc = " \ ${datadir}/phosphor-fan-presence/control/manager.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \ @@ -112,5 +112,5 @@ FILES_${PN}-control_append_p10bmc = " \ # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines -SYSTEMD_SUBSTITUTIONS_witherspoon = "ADDR:100:phosphor-fan-control@.service" -SYSTEMD_SUBSTITUTIONS_witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service" +SYSTEMD_SUBSTITUTIONS:witherspoon = "ADDR:100:phosphor-fan-control@.service" +SYSTEMD_SUBSTITUTIONS:witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service" diff --git a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend index 6c1f27534..2d9c09661 100644 --- a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_ibm-ac-server = " verify_pnor_signature" -PACKAGECONFIG_append_mihawk = " verify_pnor_signature" +PACKAGECONFIG:append:ibm-ac-server = " verify_pnor_signature" +PACKAGECONFIG:append:mihawk = " verify_pnor_signature" diff --git a/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index a440b1173..154b5c568 100644 --- a/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,18 +1,18 @@ -BMC_RW_MTD_ibm-ac-server = "bmc" -BMC_RW_MTD_p10bmc = "bmc" -BMC_RW_MTD_mihawk = "bmc" -BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc" -BMC_RO_MTD_p10bmc = "bmc" -BMC_RO_MTD_mihawk = "alt-bmc+bmc" -BMC_KERNEL_MTD_ibm-ac-server = "bmc" -BMC_KERNEL_MTD_p10bmc = "bmc" -BMC_KERNEL_MTD_mihawk = "bmc" +BMC_RW_MTD:ibm-ac-server = "bmc" +BMC_RW_MTD:p10bmc = "bmc" +BMC_RW_MTD:mihawk = "bmc" +BMC_RO_MTD:ibm-ac-server = "alt-bmc+bmc" +BMC_RO_MTD:p10bmc = "bmc" +BMC_RO_MTD:mihawk = "alt-bmc+bmc" +BMC_KERNEL_MTD:ibm-ac-server = "bmc" +BMC_KERNEL_MTD:p10bmc = "bmc" +BMC_KERNEL_MTD:mihawk = "bmc" # Enable signature verification -PACKAGECONFIG_append_ibm-ac-server = " verify_signature" -PACKAGECONFIG_append_p10bmc = " verify_signature" -PACKAGECONFIG_append_mihawk = " verify_signature" +PACKAGECONFIG:append:ibm-ac-server = " verify_signature" +PACKAGECONFIG:append:p10bmc = " verify_signature" +PACKAGECONFIG:append:mihawk = " verify_signature" # Enable sync of persistent files to the alternate BMC chip -PACKAGECONFIG_append_ibm-ac-server = " sync_bmc_files" -PACKAGECONFIG_append_mihawk = " sync_bmc_files" +PACKAGECONFIG:append:ibm-ac-server = " sync_bmc_files" +PACKAGECONFIG:append:mihawk = " sync_bmc_files" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 386a2b93d..01df2ea5b 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd DEPENDS += "virtual/obmc-gpio-monitor" -RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" S = "${WORKDIR}" SRC_URI += "file://toggle_identify_led.sh" @@ -26,5 +26,5 @@ INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "id-button-pressed.service" +SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 995dca3ae..272a8a1f5 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend index 9ceffea77..ac33cc69a 100644 --- a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN}_append_ibm-ac-server = " avsbus-control" -RDEPENDS_${PN}_append_witherspoon = " vrm-control" -RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds" -RDEPENDS_${PN}_append_mihawk = " avsbus-control" -RDEPENDS_${PN}_append_mihawk = " vrm-control" +RDEPENDS:${PN}:append:ibm-ac-server = " avsbus-control" +RDEPENDS:${PN}:append:witherspoon = " vrm-control" +RDEPENDS:${PN}:append:ibm-ac-server = " power-workarounds" +RDEPENDS:${PN}:append:mihawk = " avsbus-control" +RDEPENDS:${PN}:append:mihawk = " vrm-control" diff --git a/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend index 5ac5e59ce..ac06427a5 100644 --- a/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend +++ b/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -1,2 +1,2 @@ -SNOOP_DEVICE_witherspoon-tacoma = "" -SNOOP_DEVICE_p10bmc = "" +SNOOP_DEVICE:witherspoon-tacoma = "" +SNOOP_DEVICE:p10bmc = "" diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 05fc30378..36c631227 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,10 +1,10 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname" -OBMC_IMAGE_EXTRA_INSTALL_append_p10bmc = " mboxd ibmtpm2tss" -OBMC_IMAGE_EXTRA_INSTALL_append_witherspoon-tacoma = " ibmtpm2tss" -OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller " +OBMC_IMAGE_EXTRA_INSTALL:append:ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname" +OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd ibmtpm2tss" +OBMC_IMAGE_EXTRA_INSTALL:append:witherspoon-tacoma = " ibmtpm2tss" +OBMC_IMAGE_EXTRA_INSTALL:append:mihawk = " mboxd liberation-fonts uart-render-controller " # remove so things fit in available flash space -IMAGE_FEATURES_remove_witherspoon = "obmc-user-mgmt-ldap" +IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap" # Optionally configure IBM service accounts # @@ -58,7 +58,7 @@ IBM_EXTRA_USERS_PARAMS += " \ " # This is recipe specific to ensure it takes effect. -EXTRA_USERS_PARAMS_pn-obmc-phosphor-image += "${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', "${IBM_EXTRA_USERS_PARAMS}", '', d)}" +EXTRA_USERS_PARAMS:pn-obmc-phosphor-image += "${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', "${IBM_EXTRA_USERS_PARAMS}", '', d)}" # The service account needs sudo. -IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', 'sudo', '', d)}" +IMAGE_INSTALL:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', 'sudo', '', d)}" diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index a45f0487b..659eafd74 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,4 +1,4 @@ -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Dinsecure-tftp-update=enabled \ -Dibm-management-console=enabled \ " diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb index 0c4b56f72..1b5a119b1 100644 --- a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb @@ -14,4 +14,4 @@ do_install() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 607546b9d..16cb42658 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append_ibm-ac-server = " associations" -SRC_URI_append_ibm-ac-server = " file://associations.json" -DEPENDS_append_ibm-ac-server = " inventory-cleanup" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:append:ibm-ac-server = " associations" +SRC_URI:append:ibm-ac-server = " file://associations.json" +DEPENDS:append:ibm-ac-server = " inventory-cleanup" -PACKAGECONFIG_append_p10bmc = " associations" -SRC_URI_append_p10bmc = " \ +PACKAGECONFIG:append:p10bmc = " associations" +SRC_URI:append:p10bmc = " \ file://ibm,rainier-2u_associations.json \ file://ibm,rainier-4u_associations.json \ file://ibm,everest_associations.json \ " -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/ibm,rainier-2u_associations.json ${D}${base_datadir}/ibm,rainier-2u_associations.json install -m 0755 ${WORKDIR}/ibm,rainier-4u_associations.json ${D}${base_datadir}/ibm,rainier-4u_associations.json diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index fd27f7dce..986c2ca9f 100644 --- a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -1,9 +1,9 @@ -DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -DEPENDS_append_mihawk = " acx22-yaml-config" +DEPENDS:append:ibm-ac-server = " acx22-yaml-config" +DEPENDS:append:mihawk = " acx22-yaml-config" -EXTRA_OECONF_ibm-ac-server = " \ +EXTRA_OECONF:ibm-ac-server = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ " -EXTRA_OECONF_mihawk = " \ +EXTRA_OECONF:mihawk = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ " \ No newline at end of file diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 7898a1039..d490c0874 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Calculate the auxiliary firmware revision to be updated in the dev_id.json # file. It is calculated from the VERSION_ID field which currently has two @@ -16,7 +16,7 @@ inherit image_version unset do_patch[noexec] do_patch[depends] = "os-release:do_populate_sysroot" -python do_patch_ibm-ac-server() { +python do_patch:ibm-ac-server() { import json import re from shutil import copyfile diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 6efe241bc..30245d39a 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,11 +1,11 @@ -DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -DEPENDS_append_mihawk = " acx22-yaml-config" +DEPENDS:append:ibm-ac-server = " acx22-yaml-config" +DEPENDS:append:mihawk = " acx22-yaml-config" -EXTRA_OECONF_ibm-ac-server = " \ +EXTRA_OECONF:ibm-ac-server = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \ " -EXTRA_OECONF_mihawk = " \ +EXTRA_OECONF:mihawk = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 8d51478af..38fbd717c 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,12 +1,12 @@ -DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -DEPENDS_append_mihawk = " acx22-yaml-config" +DEPENDS:append:ibm-ac-server = " acx22-yaml-config" +DEPENDS:append:mihawk = " acx22-yaml-config" -EXTRA_OECONF_ibm-ac-server = " \ +EXTRA_OECONF:ibm-ac-server = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ " -EXTRA_OECONF_mihawk = " \ +EXTRA_OECONF:mihawk = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index c847c0564..a157e0d04 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -1,5 +1,5 @@ -ALT_RMCPP_IFACE_mihawk = "eth1" -SYSTEMD_SERVICE_${PN}_append_mihawk += " \ +ALT_RMCPP_IFACE:mihawk = "eth1" +SYSTEMD_SERVICE:${PN}:append:mihawk += " \ ${PN}@${ALT_RMCPP_IFACE}.service \ ${PN}@${ALT_RMCPP_IFACE}.socket \ " diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb index 8ee9e33cd..e72755d0c 100644 --- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb +++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -16,8 +16,8 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libwistronoem.so" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 96a97b040..57fb62b35 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -1,19 +1,19 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SYSTEMD_SERVICE_${PN}_append_p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" +SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test and OperationalStatus monitor feature for # p10bmc systems -PACKAGECONFIG_append_p10bmc = " use-json use-lamp-test monitor-operational-status" +PACKAGECONFIG:append:p10bmc = " use-json use-lamp-test monitor-operational-status" # Install the lamp test override file for p10bmc -SRC_URI_append_p10bmc = " file://lamp-test-led-overrides.json" +SRC_URI:append:p10bmc = " file://lamp-test-led-overrides.json" -pkg_postinst_${PN}_p10bmc () { +pkg_postinst:${PN}:p10bmc () { # Needed this to run as part of BMC boot mkdir -p $D$systemd_system_unitdir/multi-user.target.wants @@ -40,7 +40,7 @@ pkg_postinst_${PN}_p10bmc () { ln -s $TARGET_ID $LINK_ID } -pkg_prerm_${PN}_p10bmc () { +pkg_prerm:${PN}:p10bmc () { LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service" rm $LINK @@ -56,7 +56,7 @@ pkg_prerm_${PN}_p10bmc () { } # Install lamp test override json -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -d ${D}${datadir}/${BPN}/ install -m 0644 ${WORKDIR}/lamp-test-led-overrides.json ${D}${datadir}/${BPN}/ } diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 3163c07b9..d2efcda91 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 01714829f..361417410 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 diff --git a/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend index 23d1718fd..c3917e8f8 100644 --- a/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1,14 +1,14 @@ -MBOXD_FLASH_SIZE_ibm-ac-server = "64M" -MBOXD_FLASH_SIZE_mihawk = "64M" -MBOXD_FLASH_SIZE_p10bmc = "64M" +MBOXD_FLASH_SIZE:ibm-ac-server = "64M" +MBOXD_FLASH_SIZE:mihawk = "64M" +MBOXD_FLASH_SIZE:p10bmc = "64M" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SYSTEMD_SERVICE_${PN}_append_df-openpower-ubi-fs = " check-pnor-format.service" +SYSTEMD_SERVICE:${PN}:append:df-openpower-ubi-fs = " check-pnor-format.service" -SRC_URI_append_df-openpower-ubi-fs = " file://check_pnor_format.sh" +SRC_URI:append:df-openpower-ubi-fs = " file://check_pnor_format.sh" -do_install_append_df-openpower-ubi-fs() { +do_install:append:df-openpower-ubi-fs() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/check_pnor_format.sh ${D}${bindir}/check_pnor_format.sh } diff --git a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend index 46020aad7..e69ed5c9a 100644 --- a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend +++ b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_p10bmc = " file://mctp" -SRC_URI_append_witherspoon-tacoma = " file://mctp" +SRC_URI:append:p10bmc = " file://mctp" +SRC_URI:append:witherspoon-tacoma = " file://mctp" -PACKAGECONFIG_append_p10bmc = " astlpc-raw-kcs" -PACKAGECONFIG_append_witherspoon-tacoma = " astlpc-raw-kcs" +PACKAGECONFIG:append:p10bmc = " astlpc-raw-kcs" +PACKAGECONFIG:append:witherspoon-tacoma = " astlpc-raw-kcs" diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index a79dae669..0aee77649 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/network:" +FILESEXTRAPATHS:prepend := "${THISDIR}/network:" SRC_URI += " file://ncsi-netlink.service" -SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service" -FILES_${PN} += "${datadir}/network/*.json" +SYSTEMD_SERVICE:${PN} += " ncsi-netlink.service" +FILES:${PN} += "${datadir}/network/*.json" -PACKAGECONFIG_append = " sync-mac" +PACKAGECONFIG:append = " sync-mac" install_network_configuration(){ install -d ${D}${systemd_system_unitdir} @@ -13,22 +13,22 @@ install_network_configuration(){ install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json } -SRC_URI_append_p10bmc = " file://inventory-object-map.json" -do_install_append_p10bmc(){ +SRC_URI:append:p10bmc = " file://inventory-object-map.json" +do_install:append:p10bmc(){ install_network_configuration } -SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json" -do_install_append_ibm-ac-server() { +SRC_URI:append:ibm-ac-server = " file://inventory-object-map.json" +do_install:append:ibm-ac-server() { install_network_configuration } -SRC_URI_append_mihawk = " file://inventory-object-map.json" -do_install_append_mihawk() { +SRC_URI:append:mihawk = " file://inventory-object-map.json" +do_install:append:mihawk() { install_network_configuration } -SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json" -do_install_append_witherspoon-tacoma(){ +SRC_URI:append:witherspoon-tacoma = " file://inventory-object-map.json" +do_install:append:witherspoon-tacoma(){ install_network_configuration } diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend index c0bf602d3..8335f86bb 100644 --- a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend +++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend @@ -1,4 +1,4 @@ # P10 needs ibmtpm2tss which needs ibmswtpm2 which needs openssl # camellia support -DEPRECATED_CRYPTO_FLAGS_remove_witherspoon-tacoma = " no-camellia" -DEPRECATED_CRYPTO_FLAGS_remove_p10bmc = " no-camellia" +DEPRECATED_CRYPTO_FLAGS:remove:witherspoon-tacoma = " no-camellia" +DEPRECATED_CRYPTO_FLAGS:remove:p10bmc = " no-camellia" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 63c8b03b8..c74ca984b 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -18,26 +18,26 @@ POWER_SERVICE_PACKAGES_P10 = " \ " EXTRA_IBM_LOGGING_PKGS = "" -EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging" -EXTRA_IBM_LOGGING_PKGS_witherspoon-tacoma = "" -EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" +EXTRA_IBM_LOGGING_PKGS:witherspoon = "ibm-logging" +EXTRA_IBM_LOGGING_PKGS:witherspoon-tacoma = "" +EXTRA_IBM_LOGGING_PKGS:mihawk = "ibm-logging" -RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" -RDEPENDS_${PN}-inventory_append_p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" -RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" -RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" -RDEPENDS_${PN}-fan-control_append_p10bmc = " fan-watchdog sensor-monitor" -RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" -RDEPENDS_${PN}-extras_append_p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" -RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" +RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" +RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" +RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog" +RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor" +RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" +RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" +RDEPENDS:${PN}-extras:append:mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" +RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" -RDEPENDS_${PN}-extras_remove_p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" -RDEPENDS_${PN}-host-state-mgmt_remove_p10bmc = "checkstop-monitor" -RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" -RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" -RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" -RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor" +RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS:${PN}-host-state-mgmt:remove:p10bmc = "checkstop-monitor" +RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm" +RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" +RDEPENDS:${PN}-logging:append = " ${EXTRA_IBM_LOGGING_PKGS}" +RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor" -${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" +${PN}-software-extras:append:ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index b57abd8f4..e2e7c2374 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,8 +1,8 @@ PACKAGECONFIG += "oem-ibm" PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Dresponse-time-out=4800 \ " -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index c2f5b2cc5..9acaad768 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" -EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" +EXTRA_OEMESON:append:ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON:append:p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" +EXTRA_OEMESON:append:mihawk = " -Dpower_sequencer=mihawk-cpld" -DEPENDS_append_ibm-ac-server = " power-sequencer" -DEPENDS_append_p10bmc = " power-sequencer" +DEPENDS:append:ibm-ac-server = " power-sequencer" +DEPENDS:append:p10bmc = " power-sequencer" -PACKAGECONFIG_append_ibm-ac-server = " monitor" -PACKAGECONFIG_append_swift = " monitor" -PACKAGECONFIG_append_mihawk = " monitor" +PACKAGECONFIG:append:ibm-ac-server = " monitor" +PACKAGECONFIG:append:swift = " monitor" +PACKAGECONFIG:append:mihawk = " monitor" -do_install_append(){ +do_install:append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } -FILES_${PN} += "${datadir}/phosphor-power/psu.json" +FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index 6fc1133cf..17ff4c206 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb @@ -5,21 +5,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml" -SRC_URI_append_p10bmc = " file://ucd90160.yaml" +SRC_URI:append:ibm-ac-server = " file://ucd90160.yaml" +SRC_URI:append:p10bmc = " file://ucd90160.yaml" -FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" -FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES:${PN}:append:ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES:${PN}:append:p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" S = "${WORKDIR}" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml } -do_install_append_p10bmc() { +do_install:append:p10bmc() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 5ea6cb522..fb02ace05 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb @@ -9,7 +9,7 @@ require recipes-phosphor/power/phosphor-power.inc S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { SRC=${S}/org/open_power/Witherspoon DEST=${D}${yaml_dir}/org/open_power/Witherspoon install -d ${DEST} diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4f599a78c..4c4c88401 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" SYNC_SERVICE = "power-supply-sync.service" TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" -SYSTEMD_SERVICE_${PN} += "${SYNC_SERVICE}" +SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" SYSTEMD_LINK_${PN} += "${SYNC_FMT}" diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 6c283f455..b5abeecb2 100644 --- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_p10bmc = "hwmontempsensor" +PACKAGECONFIG:p10bmc = "hwmontempsensor" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c9e7927a3..cde45e7cc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_mihawk = "-Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:mihawk = "-Dnegative-errno-on-fail=true" -SRC_URI_append_ibm-ac-server = " \ +SRC_URI:append:ibm-ac-server = " \ file://70-hwmon.rules \ file://70-max31785-hwmon.rules \ file://start_max31785_hwmon.sh \ " -CHIPS_witherspoon = " \ +CHIPS:witherspoon = " \ bus@1e78a000/i2c-bus@100/max31785@52_air \ bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ @@ -21,7 +21,7 @@ CHIPS_witherspoon = " \ bus@1e78a000/i2c-bus@180/ir35221@71 \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " -CHIPS_swift = " \ +CHIPS:swift = " \ bus@1e78a000/i2c-bus@100/max31785@52_air \ bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ @@ -38,7 +38,7 @@ CHIPS_swift = " \ bus@1e78a000/i2c-bus@3c0/ir35221@71 \ bus@1e78a000/i2c-bus@3c0/ir35221@72 \ " -CHIPS_mihawk = " \ +CHIPS:mihawk = " \ bus@1e78a000/i2c-bus@100/power-supply@58 \ bus@1e78a000/i2c-bus@100/power-supply@5b \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -60,7 +60,7 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \ " -CHIPS_witherspoon-tacoma = " \ +CHIPS:witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@200/max31785@52_air \ bus@1e78a000/i2c-bus@200/max31785@52_water \ bus@1e78a000/i2c-bus@200/power-supply@68 \ @@ -74,29 +74,29 @@ CHIPS_witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@500/tmp275@4a \ " -CHIPS_p10bmc = " \ +CHIPS:p10bmc = " \ bus@1e78a000/i2c-bus@400/max31785@52 \ bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \ " ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -ITEMS_append_mihawk += " iio-hwmon-vdd0.conf" -ITEMS_append_mihawk += " iio-hwmon-vdd1.conf" -ITEMS_append_mihawk += " iio-hwmon-vcs0.conf" -ITEMS_append_mihawk += " iio-hwmon-vcs1.conf" -ITEMS_append_mihawk += " iio-hwmon-vdn0.conf" -ITEMS_append_mihawk += " iio-hwmon-vdn1.conf" -ITEMS_append_mihawk += " iio-hwmon-vio0.conf" -ITEMS_append_mihawk += " iio-hwmon-vio1.conf" -ITEMS_append_mihawk += " iio-hwmon-vddra.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrb.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrc.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrd.conf" -ITEMS_append_mihawk += " iio-hwmon-12v.conf" -ITEMS_append_mihawk += " iio-hwmon-5v.conf" -ITEMS_append_mihawk += " iio-hwmon-3v.conf" -ITEMS_append_mihawk += " iio-hwmon-battery.conf" +ITEMS:append:mihawk += " iio-hwmon-vdd0.conf" +ITEMS:append:mihawk += " iio-hwmon-vdd1.conf" +ITEMS:append:mihawk += " iio-hwmon-vcs0.conf" +ITEMS:append:mihawk += " iio-hwmon-vcs1.conf" +ITEMS:append:mihawk += " iio-hwmon-vdn0.conf" +ITEMS:append:mihawk += " iio-hwmon-vdn1.conf" +ITEMS:append:mihawk += " iio-hwmon-vio0.conf" +ITEMS:append:mihawk += " iio-hwmon-vio1.conf" +ITEMS:append:mihawk += " iio-hwmon-vddra.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrb.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrc.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrd.conf" +ITEMS:append:mihawk += " iio-hwmon-12v.conf" +ITEMS:append:mihawk += " iio-hwmon-5v.conf" +ITEMS:append:mihawk += " iio-hwmon-3v.conf" +ITEMS:append:mihawk += " iio-hwmon-battery.conf" OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ @@ -106,20 +106,20 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package -PACKAGECONFIG_append_ibm-ac-server = " max31785-msl" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" +SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service" +SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -d ${D}/${base_libdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 878a58a01..020a27acc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://virtual_sensor_config.json" -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 92c1bccae..ba950b3f9 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" -SRC_URI_append_ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml" -SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml" -SRC_URI_append = " file://ibm_settings.override.yml" -SRC_URI_append_p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml" -SRC_URI_append_witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:ibm-ac-server = " file://TPMEnable-default-true.override.yml" +SRC_URI:append:ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml" +SRC_URI:append:mihawk = " file://TPMEnable-default-true.override.yml" +SRC_URI:append = " file://ibm_settings.override.yml" +SRC_URI:append:p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml" +SRC_URI:append:witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml" diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend index aa8149c1b..debc568fd 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" MRW_EXPRESSION_VARS = "-v PS_DERATING=${POWER_SUPPLY_DERATING_FACTOR}" diff --git a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend index f8ff90168..bee5a5ffa 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend @@ -1,4 +1,4 @@ # Set MaxBootCycleCount to 5 on IBM systems -EXTRA_OECMAKE_append_p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5" -EXTRA_OECMAKE_append_witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5" +EXTRA_OECMAKE:append:p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5" +EXTRA_OECMAKE:append:witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5" diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 5b35a0a64..68a4ccccd 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,11 +1,11 @@ -EXTRA_OEMESON_append_witherspoon = " -Dwarm-reboot=disabled" +EXTRA_OEMESON:append:witherspoon = " -Dwarm-reboot=disabled" # The scheduled-host-transition package provides support to # schedule power on and off operations for the host at some # time in the future. IBM systems will utilize this feature -RRECOMMENDS_${PN}-host += "${PN}-scheduled-host-transition" +RRECOMMENDS:${PN}-host += "${PN}-scheduled-host-transition" # IBM systems track the state of the hypervisor so bring # in the needed package when the host state package is # included -RRECOMMENDS_${PN}-host += "${PN}-hypervisor" +RRECOMMENDS:${PN}-host += "${PN}-hypervisor" diff --git a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 6c0cbeba9..d2b84070d 100644 --- a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -1,14 +1,14 @@ -do_install_append_witherspoon() { +do_install:append:witherspoon() { DEST=${D}${inventory_envdir} printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory } -do_install_append_swift() { +do_install:append:swift() { DEST=${D}${inventory_envdir} printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory } -do_install_append_witherspoon-tacoma() { +do_install:append:witherspoon-tacoma() { DEST=${D}${inventory_envdir} printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 0d9704fcc..7d904461f 100644 --- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # utilize a 600s default timer config for p10bmc -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron" -- cgit v1.2.3 From 4d93f92dd734a1d8edfdae0e555739199c53ef63 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 11 Aug 2021 15:46:10 +0000 Subject: meta-ibm: Update local.conf.sample Update with the latest version from upstream. Change-Id: I1a7da37b0457dab873afaf6445aca360d54b47ca Signed-off-by: Adriana Kobylak --- meta-ibm/conf/local.conf.sample | 8 +- meta-ibm/meta-palmetto/conf/local.conf.sample | 116 +++++++++++++++++--------- meta-ibm/meta-romulus/conf/local.conf.sample | 90 ++++++++++++++------ meta-ibm/recipes-phosphor/dbus/snmp-policy.bb | 2 +- 4 files changed, 148 insertions(+), 68 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 9680cf03b..172631b59 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -5,10 +5,10 @@ MACHINE ??= "witherspoon" DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS:append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -17,4 +17,4 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample index e25c4d912..f421116e3 100644 --- a/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -2,11 +2,11 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended +# be set in this file. More adventurous users can look at local.conf.extended # which contains other examples of configuration which can be placed in this file # but new users likely won't need any of them initially. # -# Lines starting with the '#' character are commented out and in some cases the +# Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling # the option is a question of removing the # character and making any change to the # variable as required. @@ -20,17 +20,17 @@ #MACHINE ?= "qemuarm" #MACHINE ?= "qemuarm64" #MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" #MACHINE ?= "qemuppc" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" # -# There are also the following hardware board target machines included for +# There are also the following hardware board target machines included for # demonstration purposes: # -#MACHINE ?= "beaglebone" +#MACHINE ?= "beaglebone-yocto" #MACHINE ?= "genericx86" #MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" #MACHINE ?= "edgerouter" # # This sets the default machine to be qemux86 if no other machine is selected: @@ -82,12 +82,12 @@ MACHINE ??= "palmetto" # # The distribution setting controls which policy settings are used as defaults. # The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing +# Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # DISTRO ?= "openbmc-openpower" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -95,8 +95,8 @@ DISTRO ?= "openbmc-openpower" # # Package Management configuration # -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used # to generate the root filesystems. # Options are: # - 'package_deb' for debian style deb files @@ -107,12 +107,12 @@ DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are +# This variable specifies the architecture to build SDK items for and means +# you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" @@ -120,11 +120,13 @@ SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults # -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated # images. Some of these options are added to certain image types automatically. The # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -132,41 +134,39 @@ SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features # # The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable +# enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is # multithreaded and needs to be able to handle the case where more than one parallel # process may require the user's attention. The default is iterate over the available # terminal types to find one that works. @@ -186,12 +186,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -204,13 +204,13 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # # This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. # NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH # at the end as shown in the examples below. This will be substituted with the @@ -219,19 +219,59 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +#PACKAGECONFIG:append:pn-qemu-system-native = " sdl" PACKAGECONFIG:append:pn-qemu-native = " sdl" PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample index c5e363b95..e600acace 100644 --- a/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-ibm/meta-romulus/conf/local.conf.sample @@ -2,7 +2,9 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -85,12 +87,12 @@ DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" SANITY_TESTED_DISTROS:append ?= " *" @@ -103,6 +105,8 @@ SANITY_TESTED_DISTROS:append ?= " *" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,14 +114,14 @@ SANITY_TESTED_DISTROS:append ?= " *" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -126,20 +130,18 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # @@ -164,12 +166,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -182,7 +184,7 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # @@ -197,19 +199,57 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG:append:pn-qemu-native = " sdl" -#PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +#PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb index 94fce404a..1528487ac 100644 --- a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb @@ -14,4 +14,4 @@ do_install() { install -D ${WORKDIR}/snmp-config.yaml ${D}${config_dir}/snmp-config.yaml } -FILES_${PN} += "${config_dir}/snmp-config.yaml" +FILES:${PN} += "${config_dir}/snmp-config.yaml" -- cgit v1.2.3 From 57b76249b10ce1ebf7b881c3de7521b40ecee7b8 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 11 Aug 2021 15:27:06 -0500 Subject: meta-{ibm, openpower}: minor override syntax fixes Signed-off-by: Patrick Williams Change-Id: Iadecbc8418d901f82fcc741d3e88d2d202fe96fe --- meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 2 +- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index d2efcda91..8d6e64073 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -35,7 +35,7 @@ PACKAGECONFIG:ibm-ac-server = "policy-interface" PACKAGECONFIG:mihawk = "policy-interface" SERVICE = "com.ibm.Logging.service" -DBUS_SERVICE_${PN} += "${SERVICE}" +DBUS_SERVICE:${PN} += "${SERVICE}" #The link is so that this service will restart if phosphor-logging restarts. #The BindsTo in the service will not do the restart, it will only do the diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index ee6f01303..4fc437f5c 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -63,7 +63,7 @@ SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" SRCREV = "5dc5d6cc6796ef038c59e41297349a982c8dd296" -DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" +DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" SYSTEMD_SERVICE:${PN} += " \ op-pnor-msl.service \ diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 02237b008..3903ef616 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -19,7 +19,7 @@ do_install:append() { ${D}${bindir}/occ-active.sh } -DBUS_SERVICE_${PN} += "org.open_power.OCC.Control.service" +DBUS_SERVICE:${PN} += "org.open_power.OCC.Control.service" SYSTEMD_SERVICE:${PN} += "op-occ-enable@.service" SYSTEMD_SERVICE:${PN} += "op-occ-disable@.service" -- cgit v1.2.3 From 3475f830d63db1856b1d0431802da541bd531829 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 12 Aug 2021 09:09:41 -0400 Subject: witherspoon: remove telemetry Running out of flash space on our witherspoon system so need to cut back some function. Telemetry is fairly new and takes a sizeable chunk of flash space (200KB) Tested: - Verified squashfs went from 19.20MB to 19.00MB with this change Signed-off-by: Andrew Geissler Change-Id: I1741649f573cd25363167d69b4a802f2f261d93a --- meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 36c631227..e0288c5f3 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -5,6 +5,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append:mihawk = " mboxd liberation-fonts uart-render-co # remove so things fit in available flash space IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap" +IMAGE_FEATURES:remove:witherspoon = "obmc-telemetry" # Optionally configure IBM service accounts # -- cgit v1.2.3 From 28a6a30e9d546c70976549cffd7f970509220174 Mon Sep 17 00:00:00 2001 From: Shantappa Teekappanavar Date: Tue, 10 Aug 2021 15:57:48 -0500 Subject: meta-ibm: meson build option 'hostboot-dump-collection' is enabled The hostboot dump collection initiated by watchdog_timeout is disabled by default. This commit enables hostboot dump collection on p10bmc platforms for watchdog timeout. Build watchdog_timeout binary: $ devtool modify -n openpower-debug-collector $ MACHINE=p10bmc bitbake openpower-debug-collector Test: Ran watchdog_timeout binary built by bitbake, and verified that the binary takes the timeout value and times out after the specified time interval Signed-off-by: Shantappa Teekappanavar Change-Id: I343aac95fd97feb226d8676c3c34c2902c1c6690 --- meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend new file mode 100644 index 000000000..d20060c85 --- /dev/null +++ b/meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend @@ -0,0 +1 @@ +EXTRA_OEMESON:append:p10bmc = " -Dhostboot-dump-collection=enabled " -- cgit v1.2.3 From 6991461283887ae62af4107a19b95edeca7abf9c Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 4 Aug 2021 12:52:47 +0930 Subject: meta-ibm: p10bmc: Assert that we want the SPL signed by socsec Configure the SOCSEC_SIGN_* variables to sign the SPL and exploit the AST2600 hardware root-of-trust. Note that this doesn't require that secure-boot is enabled on the system, the SoC will bootstrap just fine with the signature in place while secure-boot is disabled. Signing the SPL allows us to switch the systems over to secure-boot at our leisure. Change-Id: I07b5c4afb7bacc040cbdce6c82a0fb3a57d0f7f8 Signed-off-by: Andrew Jeffery --- meta-ibm/conf/machine/p10bmc.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 2b7463e28..19de5eec8 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -55,5 +55,7 @@ SPL_SIGN_KEYNAME = "rsa_oem_fitimage_key" UBOOT_SIGN_KEYDIR = "${WORKDIR}" SPL_SIGN_KEYDIR = "${WORKDIR}" +SOCSEC_SIGN_ENABLE = "1" + DEBUG_TRIGGERS = "kcs2" PACKAGECONFIG:append:pn-debug-trigger = " triggers" -- cgit v1.2.3 From 782d7195eac9bb9e05f86477b9537dbbee26930c Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 16 Aug 2021 23:51:27 -0600 Subject: Fix path to udev rules files Use nonarch_base_libdir instead of base_libdir, because the files are always in /lib/udev/rules.d/. On ppc64le base_libdir is lib64, and the files end up in the wrong spot. Signed-off-by: Anton Blanchard Change-Id: I3c24dae293f4166f1ed1826d09d4bde7cd7d0357 --- meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb | 4 ++-- meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb | 4 ++-- .../meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend | 2 +- .../meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend | 4 ++-- meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb | 4 ++-- meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 ++-- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb | 4 ++-- meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb | 2 +- meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb | 4 ++-- meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 4 ++-- .../recipes-phosphor/console/obmc-console_%.bbappend | 6 +++--- .../recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) (limited to 'meta-ibm') diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb index ea52c2ff2..3f30916bd 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb @@ -10,6 +10,6 @@ SRC_URI += "file://76-aspeed-mtd-partitions.rules" RDEPENDS:${PN} += "udev" do_install() { - install -d ${D}/${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/76-aspeed-mtd-partitions.rules ${D}/${base_libdir}/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/76-aspeed-mtd-partitions.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb index 188b0a434..44cafca8c 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb @@ -10,6 +10,6 @@ SRC_URI += "file://61-aspeed-vuart.rules" RDEPENDS:${PN} += "udev" do_install() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/61-aspeed-vuart.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/61-aspeed-vuart.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend index 192b25086..2a5efdb09 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend @@ -9,6 +9,6 @@ SYSTEMD_SERVICE:${PN} += " \ " do_install:append() { - rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules + rm -rf ${D}${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir} } diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index e5101fff8..de2b22cfa 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -7,6 +7,6 @@ SYSTEMD_SERVICE:${PN}:append = " ${PN}@${SMM_DEVICE}.service " SRC_URI += "file://99-ipmi-kcs.rules" do_install:append() { - install -d ${D}${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${base_libdir}/udev/rules.d/ + install -d ${D}${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb b/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb index dc185655b..9954b6397 100644 --- a/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb +++ b/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb @@ -10,6 +10,6 @@ SRC_URI += "file://76-gxp-mtd-partitions.rules" RDEPENDS_${PN} += "udev" do_install() { - install -d ${D}/${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/76-gxp-mtd-partitions.rules ${D}/${base_libdir}/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/76-gxp-mtd-partitions.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index cde45e7cc..080025ead 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -120,8 +120,8 @@ SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.ser SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" do_install:append:ibm-ac-server() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ install -d ${D}${bindir} install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir} diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb index f3b7d4d9f..b9555159d 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb @@ -39,6 +39,6 @@ do_install:append() { install -d ${DEST} install ${SRC}/inventory ${DEST} - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m0644 ${WORKDIR}/70-op-vpd.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m0644 ${WORKDIR}/70-op-vpd.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 2da124be0..1a8022c8a 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -40,7 +40,7 @@ SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service" FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor" FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor" FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util" -FILES:${PN}-monitor += "${base_libdir}/udev/rules.d/99-gpio-keys.rules" +FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules" FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence" SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 62126e43d..684e41c3a 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -24,6 +24,6 @@ SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" S = "${WORKDIR}/git" do_install:append() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 1b91ba364..c7273a032 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -26,8 +26,8 @@ MBOXD_FLASH_SIZE ??= "32M" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" do_install:append() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/${nonarch_base_libdir}/udev/rules.d } TMPL = "mboxd-reload@.service" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend index 5231622da..e38befbb6 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend @@ -8,7 +8,7 @@ do_install:append:olympus-nuvoton() { install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyS2.conf - install -d ${D}/lib/udev/rules.d - rm -f ${D}/lib/udev/rules.d/80-obmc-console-uart.rules - install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules + install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index efca54174..c40d537d0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -5,6 +5,6 @@ SRC_URI:append:olympus-nuvoton = " file://99-ipmi-kcs.rules.rules" KCS_DEVICE:olympus-nuvoton = "ipmi_kcs1" do_install:append:olympus-nuvoton() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/${nonarch_base_libdir}/udev/rules.d } -- cgit v1.2.3 From ce1426257525128c9c8f17e91afc6a60d1cb6244 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 23 Aug 2021 16:26:20 -0500 Subject: treewide: remove gategarth from layer-support We've typically kept these LAYERSERIES_COMPAT to 2 releases: the current and the upcoming. Remove 'gatesgarth' is it is now 2 releases back. Signed-off-by: Patrick Williams Change-Id: I5e812a94fed1738898af75c0fdee81996a5bbf20 --- meta-alibaba/conf/layer.conf | 2 +- meta-alibaba/meta-thor/conf/layer.conf | 2 +- meta-amd/conf/layer.conf | 2 +- meta-amd/meta-ethanolx/conf/layer.conf | 2 +- meta-ampere/conf/layer.conf | 2 +- meta-ampere/meta-jade/conf/layer.conf | 2 +- meta-arm/conf/layer.conf | 2 +- meta-aspeed/conf/layer.conf | 2 +- meta-asrock/conf/layer.conf | 2 +- meta-asrock/meta-e3c246d4i/conf/layer.conf | 2 +- meta-bytedance/conf/layer.conf | 2 +- meta-bytedance/meta-g220a/conf/layer.conf | 2 +- meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf | 2 +- meta-facebook/conf/layer.conf | 2 +- meta-facebook/meta-bletchley/conf/layer.conf | 2 +- meta-facebook/meta-tiogapass/conf/layer.conf | 2 +- meta-facebook/meta-yosemitev2/conf/layer.conf | 2 +- meta-google/conf/layer.conf | 2 +- meta-hpe/conf/layer.conf | 2 +- meta-hpe/meta-dl360poc/conf/layer.conf | 2 +- meta-hpe/meta-gxp/conf/layer.conf | 2 +- meta-hxt/conf/layer.conf | 2 +- meta-ibm/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-romulus/conf/layer.conf | 2 +- meta-ingrasys/conf/layer.conf | 2 +- meta-ingrasys/meta-zaius/conf/layer.conf | 2 +- meta-inspur/conf/layer.conf | 2 +- meta-inspur/meta-fp5280g2/conf/layer.conf | 2 +- meta-inspur/meta-on5263m5/conf/layer.conf | 2 +- meta-intel-openbmc/conf/layer.conf | 2 +- meta-intel-openbmc/meta-s2600wf/conf/layer.conf | 2 +- meta-inventec/conf/layer.conf | 2 +- meta-lenovo/conf/layer.conf | 2 +- meta-lenovo/meta-hr630/conf/layer.conf | 2 +- meta-lenovo/meta-hr855xg2/conf/layer.conf | 2 +- meta-microsoft/conf/layer.conf | 2 +- meta-microsoft/meta-olympus/conf/layer.conf | 2 +- meta-nuvoton/conf/layer.conf | 2 +- meta-openpower/conf/layer.conf | 2 +- meta-phosphor/conf/layer.conf | 2 +- meta-portwell/meta-neptune/conf/layer.conf | 2 +- meta-qualcomm/conf/layer.conf | 2 +- meta-quanta/conf/layer.conf | 2 +- meta-quanta/meta-f0b/conf/layer.conf | 2 +- meta-quanta/meta-gbs/conf/layer.conf | 2 +- meta-quanta/meta-gsj/conf/layer.conf | 2 +- meta-quanta/meta-olympus-nuvoton/conf/layer.conf | 2 +- meta-quanta/meta-q71l/conf/layer.conf | 2 +- meta-supermicro/conf/layer.conf | 2 +- meta-supermicro/meta-x11spi/conf/layer.conf | 2 +- meta-x86/conf/layer.conf | 2 +- meta-yadro/conf/layer.conf | 2 +- meta-yadro/meta-nicole/conf/layer.conf | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) (limited to 'meta-ibm') diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf index 435d1ddec..715ba5142 100644 --- a/meta-alibaba/conf/layer.conf +++ b/meta-alibaba/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "alibaba-layer" BBFILE_PATTERN_alibaba-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_alibaba-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_alibaba-layer = "hardknott" diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf index 89eca706a..6ae627170 100644 --- a/meta-alibaba/meta-thor/conf/layer.conf +++ b/meta-alibaba/meta-thor/conf/layer.conf @@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "" BBFILE_PATTERN := "^${LAYERDIR}/" -LAYERSERIES_COMPAT = "gatesgarth hardknott" +LAYERSERIES_COMPAT = "hardknott" diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf index 8caa32493..7fc59b9ac 100644 --- a/meta-amd/conf/layer.conf +++ b/meta-amd/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "amd-layer" BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_amd-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_amd-layer = "hardknott" diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf index 818ab7df1..0564fe424 100644 --- a/meta-amd/meta-ethanolx/conf/layer.conf +++ b/meta-amd/meta-ethanolx/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "ethanolx-layer" BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_ethanolx-layer = "6" -LAYERSERIES_COMPAT_ethanolx-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_ethanolx-layer = "hardknott" diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf index e1d7fe118..321e2b24f 100644 --- a/meta-ampere/conf/layer.conf +++ b/meta-ampere/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ampere-layer" BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ampere-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ampere-layer = "hardknott honister" diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf index 7b5a07f3d..f979db1c7 100644 --- a/meta-ampere/meta-jade/conf/layer.conf +++ b/meta-ampere/meta-jade/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "jade-layer" BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_jade-layer = "hardknott honister" diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index d111b24b8..102a0ccd9 100644 --- a/meta-arm/conf/layer.conf +++ b/meta-arm/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "arm" BBFILE_PATTERN_arm = "^${LAYERDIR}/" LAYERVERSION_arm = "1" -LAYERSERIES_COMPAT_arm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_arm = "hardknott" diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index 21b96413b..9dd3b72aa 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" LAYERVERSION_aspeed-layer = "1" -LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_aspeed-layer = "hardknott honister" diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf index 37e452cec..4c06d8774 100644 --- a/meta-asrock/conf/layer.conf +++ b/meta-asrock/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "asrock-layer" BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/" LAYERVERSION_asrock-layer = "1" -LAYERSERIES_COMPAT_asrock-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_asrock-layer = "hardknott" diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf index aff53c469..6b8e77192 100644 --- a/meta-asrock/meta-e3c246d4i/conf/layer.conf +++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "e3c246d4i-layer" BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_e3c246d4i-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott" diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf index 241bc6d45..9ece82f09 100644 --- a/meta-bytedance/conf/layer.conf +++ b/meta-bytedance/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bytedance-layer" BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bytedance-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bytedance-layer = "hardknott honister" diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf index 4e4f0092a..e5a5f96dc 100644 --- a/meta-bytedance/meta-g220a/conf/layer.conf +++ b/meta-bytedance/meta-g220a/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "g220a-layer" BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_g220a-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_g220a-layer = "hardknott honister" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf index b3ef55cba..277e712aa 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-evb-ast2600" BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_meta-evb-ast2600 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_meta-evb-ast2600 = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/conf/layer.conf b/meta-evb/meta-evb-enclustra/conf/layer.conf index e83298fae..278b6b5f1 100644 --- a/meta-evb/meta-evb-enclustra/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-enclustra" BBFILE_PATTERN_evb-enclustra = "" -LAYERSERIES_COMPAT_evb-enclustra = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-enclustra = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf index ea08f5a56..d9944132d 100644 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "evb-zx3-pm3" BBFILE_PATTERN_evb-zx3-pm3 = "" -LAYERSERIES_COMPAT_evb-zx3-pm3 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-zx3-pm3 = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf index fe07f91ea..5c4dfedf7 100644 --- a/meta-evb/meta-evb-nuvoton/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-nuvoton" BBFILE_PATTERN_evb-nuvoton = "" -LAYERSERIES_COMPAT_evb-nuvoton = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-nuvoton = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf index 8d64d158e..543f6a6e9 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-npcm750" BBFILE_PATTERN_evb-npcm750 = "" -LAYERSERIES_COMPAT_evb-npcm750 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-npcm750 = "hardknott honister" diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index 895d48fc1..9e4cf5521 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_facebook-layer := "hardknott honister" diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf index 8e2770903..14d320079 100644 --- a/meta-facebook/meta-bletchley/conf/layer.conf +++ b/meta-facebook/meta-bletchley/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bletchley-layer" BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bletchley-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister" diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index bb8ecee76..af34387cf 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 091cdc369..654ffabba 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister" diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf index 346946b99..47379e427 100644 --- a/meta-google/conf/layer.conf +++ b/meta-google/conf/layer.conf @@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \ BBFILE_COLLECTIONS += "google-layer" BBFILE_PATTERN_google-layer := "^${LAYERDIR}/" LAYERVERSION_google-layer = "1" -LAYERSERIES_COMPAT_google-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_google-layer = "hardknott honister" diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf index 6ff79df8f..2b8f43b06 100644 --- a/meta-hpe/conf/layer.conf +++ b/meta-hpe/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hpe-layer" BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_hpe-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hpe-layer = "hardknott" # Provide a variable that points the base of the hpe layer. HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf index 5f85f7c1c..6e3d5c4f9 100644 --- a/meta-hpe/meta-dl360poc/conf/layer.conf +++ b/meta-hpe/meta-dl360poc/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "dl360poc-layer" BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_dl360poc-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_dl360poc-layer = "hardknott" diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf index 28f2ddc87..4612c22b0 100644 --- a/meta-hpe/meta-gxp/conf/layer.conf +++ b/meta-hpe/meta-gxp/conf/layer.conf @@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gxp-layer" BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/" LAYERVERSION_gxp-layer = "1" -LAYERSERIES_COMPAT_gxp-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gxp-layer = "hardknott" GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf index bc8cd5bc0..96be31b7b 100644 --- a/meta-hxt/conf/layer.conf +++ b/meta-hxt/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "hxt" BBFILE_PATTERN_hxt = "" -LAYERSERIES_COMPAT_hxt = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hxt = "hardknott" diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 95c571be6..5d49c2d27 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ibm-layer = "hardknott honister" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index f40a9511d..e57b1d5ed 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_palmetto-layer = "hardknott honister" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index efeb24a95..3651ada69 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_romulus-layer = "hardknott honister" diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index fc07b595d..66d991ac5 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ingrasys = "hardknott honister" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index 0f930d88c..6f62318b9 100644 --- a/meta-ingrasys/meta-zaius/conf/layer.conf +++ b/meta-ingrasys/meta-zaius/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "zaius" BBFILE_PATTERN_zaius := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_zaius = "hardknott honister" diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 3e91eb548..9e1f53fb1 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_inspur-layer = "hardknott honister" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 99be9a192..f921ba6fe 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index f638bcc68..2dcf54c88 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister" diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf index 3b53a7f1c..f082cafa9 100644 --- a/meta-intel-openbmc/conf/layer.conf +++ b/meta-intel-openbmc/conf/layer.conf @@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_intel = "hardknott honister" LAYERDEPENDS_intel = "phosphor-layer" diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf index 936b1a9c0..07e7a8369 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf +++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_s2600wf = "hardknott honister" diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf index 08ca2651e..2b5eade4c 100644 --- a/meta-inventec/conf/layer.conf +++ b/meta-inventec/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "inventec" BBFILE_PATTERN_inventec = "" -LAYERSERIES_COMPAT_inventec = "gatesgarth hardknott" +LAYERSERIES_COMPAT_inventec = "hardknott" diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf index 180e9603e..0b7cb4fe9 100644 --- a/meta-lenovo/conf/layer.conf +++ b/meta-lenovo/conf/layer.conf @@ -12,7 +12,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "lenovo-layer" BBFILE_PATTERN_lenovo-layer = "" LAYERVERSION_lenovo-layer = "1" -LAYERSERIES_COMPAT_lenovo-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_lenovo-layer = "hardknott" # Provide a variable that points the base of the lenovo layer. LENOVOBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf index 9c1b4d652..2c6117c74 100644 --- a/meta-lenovo/meta-hr630/conf/layer.conf +++ b/meta-lenovo/meta-hr630/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr630-layer" BBFILE_PATTERN_hr630-layer = "" BBFILE_PRIORITY_hr630-layer = "5" -LAYERSERIES_COMPAT_hr630-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr630-layer = "hardknott" diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf index 364143298..2af2de166 100644 --- a/meta-lenovo/meta-hr855xg2/conf/layer.conf +++ b/meta-lenovo/meta-hr855xg2/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr855xg2-layer" BBFILE_PATTERN_hr855xg2-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_hr855xg2-layer = "5" -LAYERSERIES_COMPAT_hr855xg2-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr855xg2-layer = "hardknott" diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf index 03c6d8fc7..498b391ed 100755 --- a/meta-microsoft/conf/layer.conf +++ b/meta-microsoft/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "microsoft-layer" BBFILE_PATTERN_microsoft-layer = "" -LAYERSERIES_COMPAT_microsoft-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_microsoft-layer = "hardknott" diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf index 1132bedd2..db4714534 100755 --- a/meta-microsoft/meta-olympus/conf/layer.conf +++ b/meta-microsoft/meta-olympus/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "olympus-layer" BBFILE_PATTERN_olympus-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_olympus-layer = "6" -LAYERSERIES_COMPAT_olympus-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_olympus-layer = "hardknott" diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index 946ac2374..26830d3b1 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_nuvoton-layer = "hardknott honister" diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 4236ab266..9a16ca01f 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer" -LAYERSERIES_COMPAT_openpower-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_openpower-layer = "hardknott honister" diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 783545687..7e510ea50 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" LAYERVERSION_phosphor-layer = "1" -LAYERSERIES_COMPAT_phosphor-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_phosphor-layer = "hardknott honister" IMAGE_FEATURES[validitems] += "tools-profile" diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf index 3ca3cac68..652c8a85d 100644 --- a/meta-portwell/meta-neptune/conf/layer.conf +++ b/meta-portwell/meta-neptune/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "neptune" BBFILE_PATTERN_neptune = "" -LAYERSERIES_COMPAT_neptune = "gatesgarth hardknott" +LAYERSERIES_COMPAT_neptune = "hardknott" diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf index e4c872117..1efa8f6eb 100644 --- a/meta-qualcomm/conf/layer.conf +++ b/meta-qualcomm/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "qualcomm" BBFILE_PATTERN_qualcomm = "" -LAYERSERIES_COMPAT_qualcomm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_qualcomm = "hardknott" diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 39655f5ea..a64d93e6c 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_quanta-layer = "hardknott honister" diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf index f29015eb6..021711a07 100644 --- a/meta-quanta/meta-f0b/conf/layer.conf +++ b/meta-quanta/meta-f0b/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "f0b-layer" BBFILE_PATTERN_f0b-layer = "" -LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_f0b-layer = "hardknott honister" diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index 3f738a053..9f41e0501 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index a429102b1..7591e0953 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf index c62ff264a..e78bf9576 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "olympus-nuvoton-layer" BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_olympus-nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister" diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf index 98e71463b..991945384 100644 --- a/meta-quanta/meta-q71l/conf/layer.conf +++ b/meta-quanta/meta-q71l/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "q71l" BBFILE_PATTERN_q71l = "" -LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_q71l = "hardknott honister" diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf index f46b3746d..d3943d302 100644 --- a/meta-supermicro/conf/layer.conf +++ b/meta-supermicro/conf/layer.conf @@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "supermicro-layer" BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_supermicro-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_supermicro-layer := "hardknott" diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf index d77e82e90..83c64e4b3 100644 --- a/meta-supermicro/meta-x11spi/conf/layer.conf +++ b/meta-supermicro/meta-x11spi/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "x11spi" BBFILE_PATTERN_x11spi = "" -LAYERSERIES_COMPAT_x11spi = "gatesgarth hardknott" +LAYERSERIES_COMPAT_x11spi = "hardknott" diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf index cd4289954..aab9a63e2 100644 --- a/meta-x86/conf/layer.conf +++ b/meta-x86/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "obmc_machines_x86" BBFILE_PATTERN_obmc_machines_x86 = "" -LAYERSERIES_COMPAT_obmc_machines_x86 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_obmc_machines_x86 = "hardknott honister" diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 8d6466ffb..b291db86a 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yadro-layer" BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" -LAYERSERIES_COMPAT_yadro-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_yadro-layer = "hardknott honister" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index fc18b8c59..13820273f 100644 --- a/meta-yadro/meta-nicole/conf/layer.conf +++ b/meta-yadro/meta-nicole/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nicole-layer" BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_nicole-layer = "hardknott honister" -- cgit v1.2.3 From 29da7d3767abab50927902674aa5797e3ff07519 Mon Sep 17 00:00:00 2001 From: Shantappa Teekappanavar Date: Tue, 17 Aug 2021 16:46:54 -0500 Subject: meta-ibm: Enable eth1 as an alternate RMCP+ interface Testing: Built image for p10bmc platform, installed on a test system, and verified netipmid was started on both eth0 and eth1 interfaces. Also, verified that ipmitool commands work as expected for IP addresses configured on eth0 and eth1 interfaces Signed-off-by: Shantappa Teekappanavar Change-Id: Ie8399ba1219dac2f9c4ac15b7dfcf7e746750f0d --- .../p10bmc/channel_config.json | 178 +++++++++++++++++++++ .../ipmi/phosphor-ipmi-net_%.bbappend | 7 +- 2 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/p10bmc/channel_config.json (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/p10bmc/channel_config.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/p10bmc/channel_config.json new file mode 100644 index 000000000..7f26c247e --- /dev/null +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/p10bmc/channel_config.json @@ -0,0 +1,178 @@ +{ + "0" : { + "name" : "IPMB", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "1" : { + "name" : "eth0", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "2" : { + "name" : "eth1", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "3" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "4" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "5" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "6" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "7" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "8" : { + "name" : "INTRABMC", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "oem", + "protocol_type" : "oem", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "9" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "10" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "11" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "12" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "13" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "14" : { + "name" : "SELF", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "15" : { + "name" : "SMS", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "system-interface", + "protocol_type" : "kcs", + "session_supported" : "session-less", + "is_ipmi" : true + } + } +} diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index a157e0d04..4956dd78d 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -1,6 +1,11 @@ -ALT_RMCPP_IFACE:mihawk = "eth1" +ALT_RMCPP_IFACE:mihawk = "eth1" SYSTEMD_SERVICE:${PN}:append:mihawk += " \ ${PN}@${ALT_RMCPP_IFACE}.service \ ${PN}@${ALT_RMCPP_IFACE}.socket \ " +ALT_RMCPP_IFACE:p10bmc = "eth1" +SYSTEMD_SERVICE:${PN}:append:p10bmc += " \ + ${PN}@${ALT_RMCPP_IFACE}.service \ + ${PN}@${ALT_RMCPP_IFACE}.socket \ + " -- cgit v1.2.3 From 3aa0aa841ef190e646f521b295c99f9889703798 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 17 Aug 2021 15:51:55 -0500 Subject: systemd: set zstd as default PACKAGECONFIG Upstream supports zstd compression now as an alternative to zlib or xz. zstd is only slightly larger than xz but is significantly faster. This makes it a better candidate for the journal. Enable it in systemd instead of xz. Add an exemption for witherspoon to continue using xz instead. Having both zstd and xz support built into the image puts us over the flash limit and we currently need xz for phosphor-debug-collector. Signed-off-by: Patrick Williams Change-Id: I6fb55b96776aeeea1c544743b08bdbbc2853e7b7 --- meta-ibm/recipes-core/systemd/systemd_%.bbappend | 6 ++++++ meta-phosphor/recipes-core/systemd/systemd_%.bbappend | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index b61d9306d..354ea4055 100644 --- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend @@ -25,3 +25,9 @@ do_install:append:p10bmc() { install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-16MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } + +# Witherspoon doesn't have the space for the both zstd and xz compression +# libraries and currently phosphor-debug-collector is using xz. Switch systemd +# to use xz so only one of the two is added into the image. +PACKAGECONFIG:remove:witherspoon = "zstd" +PACKAGECONFIG:append:witherspoon = " xz" diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 20ce37c11..8a072770d 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -14,7 +14,7 @@ PACKAGECONFIG = "\ sysvinit \ timedated \ timesyncd \ - xz \ + zstd \ " FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -- cgit v1.2.3 From 5f9557852cfbd923488b1838d489ed6583eb334f Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 26 Aug 2021 10:40:53 +0930 Subject: meta-ibm: p10bmc: Clean up variable definitions With the reshuffle that occurred in 38cfcc393d9e ("meta-aspeed: u-boot-aspeed-sdk: Use provided signing key by default") we no-longer need to specify these options in p10bmc.conf Mistakenly, `SOCSEC_SIGN_ENABLE = "1"` was duplicated later in the file by 699146128388 ("meta-ibm: p10bmc: Assert that we want the SPL signed by socsec"). Removing the instance as done in this patch still leaves us with the positive assertion that we want SPL signing enabled. Change-Id: Iaa9cbe5b0ba4aaf69bb0fba1eb8f6bc62d085a33 Signed-off-by: Andrew Jeffery --- meta-ibm/conf/machine/p10bmc.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 19de5eec8..4956f8772 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -37,9 +37,6 @@ IMAGE_FEATURES:remove = "obmc-ikvm" UBOOT_SIGN_ENABLE = "1" SPL_SIGN_ENABLE = "1" -SOCSEC_SIGN_ENABLE = "1" -SOCSEC_SIGN_EXTRA_OPTS = "--stack_intersects_verification_region=false" -SOCSEC_SIGN_KEY ?= "${WORKDIR}/rsa_oem_dss_key.pem" FIT_HASH_ALG = "sha512" FIT_SIGN_ALG = "rsa4096" -- cgit v1.2.3 From e83c22094b7e4970c96bcee273ab08d05bbc0a30 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:17:33 -0500 Subject: 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 Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb --- .../recipes-ac01/host/ampere-hostctrl.bb | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- .../recipes-ampere/platform/mtjade-gpio-config.bb | 4 +-- .../recipes-phosphor/gpio/fault-monitor.bb | 4 +-- .../recipes-phosphor/gpio/host-gpio-handling.bb | 4 +-- .../meta-jade/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../recipes-phosphor/gpio/psu-hotswap-reset.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/gpio/id-button.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/power-workarounds.bb | 2 +- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 6 ++-- .../dbus/phosphor-dbus-monitor_%.bbappend | 4 +-- meta-ibm/recipes-phosphor/fans/fan-watchdog.bb | 6 ++-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 38 +++++++++++----------- meta-ibm/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 8 ++--- .../leds/phosphor-led-manager_%.bbappend | 2 +- .../recipes-phosphor/logging/ibm-logging_git.bb | 2 +- .../power/phosphor-power_%.bbappend | 2 +- .../power/witherspoon-power-supply-sync.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vcs-control.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../power/phosphor-power_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- ...openpower-software-manager-virtual-pnor.bbclass | 8 ++--- .../flash/phosphor-software-manager_%.bbappend | 2 +- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 4 +-- .../recipes-phosphor/host/checkstop-monitor.bb | 6 ++-- .../recipes-phosphor/host/p9-cfam-override.bb | 2 +- .../recipes-phosphor/host/p9-host-start.bb | 2 +- .../occ/openpower-occ-control_git.bb | 6 ++-- .../classes/obmc-phosphor-systemd.bbclass | 12 +++---- .../chassis/obmc-host-failure-reboots.bb | 2 +- .../chassis/obmc-op-control-power_git.bb | 24 +++++++------- .../recipes-phosphor/fans/phosphor-fan_git.bb | 14 ++++---- .../host/obmc-op-control-host_git.bb | 2 +- .../ipmi/phosphor-ipmi-host_git.bb | 2 +- .../leds/phosphor-led-manager_git.bb | 6 ++-- meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 2 +- .../state/phosphor-state-manager_git.bb | 12 +++---- meta-phosphor/recipes-phosphor/video/fbterm_git.bb | 2 +- .../watchdog/phosphor-watchdog_git.bb | 8 ++--- .../recipes-phosphor/chassis/ir38163-workaround.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../gpio/phosphor-gpio-monitor_%.bbappend | 28 ++++++++-------- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../watchdog/phosphor-watchdog_%.bbappend | 8 ++--- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- 81 files changed, 207 insertions(+), 207 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb index c6ee5d0e2..03f0d58ad 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -24,12 +24,12 @@ HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset@.service" HOST_WARM_REBOOT_FORCE_INSTMPL = "ampere-host-force-reset@{0}.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" HOST_ON_RESET_HOSTTMPL = "ampere-host-on-host-check@.service" HOST_ON_RESET_HOSTINSTMPL = "ampere-host-on-host-check@{0}.service" HOST_ON_RESET_HOSTTGTFMT = "obmc-host-startmin@{0}.target" HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT}.requires/${HOST_ON_RESET_HOSTINSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}" diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index e8ef45d60..b25ba5d94 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" FILES:${PN} += "${systemd_system_unitdir}/*" diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb index cc79f5b1a..8886fec6c 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb @@ -28,14 +28,14 @@ CHASSIS_POWERON_SVC = "ampere-gpio-poweron@.service" CHASSIS_POWERON_INSTMPL = "ampere-gpio-poweron@{0}.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" # chassis power off CHASSIS_POWEROFF_SVC = "ampere-gpio-poweroff@.service" CHASSIS_POWEROFF_INSTMPL = "ampere-gpio-poweroff@{0}.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb index 49376ee9b..4994183a0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb @@ -19,7 +19,7 @@ do_install() { OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \ +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/gpio/s0_fault_alert \ obmc/gpio/s1_fault_alert \ " @@ -29,5 +29,5 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere_fault_led.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb index cde625f5b..79bfb726e 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack" -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/reboot_ack \ obmc/gpio/shutdown_ack \ " @@ -20,4 +20,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere-host-shutdown-ack@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb index 8e57c3ea2..c1a616a9c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb @@ -16,7 +16,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -26,4 +26,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index c6400c2f0..527cbbda0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb index 2ca18a0be..839c6d4d1 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -13,7 +13,7 @@ OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" # Copies config file having arguments for psu # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \ obmc/gpio/PSU2_B25 \ " SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" @@ -29,4 +29,4 @@ GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index d7128f4f4..5150e2312 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -16,11 +16,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:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@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:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 43a6f17d5..a77a59be0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,7 +21,7 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}" ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" do_install:append:mtjade() { SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 140154990..970b12c6a 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index 461aeb5d4..f7daa94a8 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -37,42 +37,42 @@ SYSTEMD_SERVICE:${PN} = " \ HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" # Force the power cycle target to run the ampere power cycle HOST_REBOOT_SVC = "ampere-host-power-cycle.service" HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite the host reset to graceful reset HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite force reboot HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 787ddabc6..020212ad8 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 13b8535a5..573c0b869 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index 52fc793ac..36b77a03d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -28,6 +28,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_DIS}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 7981baa0c..f25f35442 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -24,4 +24,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 3cbf82408..a7bebeb1c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e3d012247..703cac279 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index c46926f90..1ae5699b7 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -31,6 +31,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" -SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index 2d00264dc..6ab0ae2d2 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -23,4 +23,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a9ef7fae..cc297d27b 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -37,6 +37,6 @@ FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRU SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}" -SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 3071cb4c9..6731a7abb 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,2 @@ -SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" -SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index ad44ba346..4673c44c0 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -18,6 +18,6 @@ WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" -SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" +SYSTEMD_LINK:${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 8b4e91e93..469f76539 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -19,42 +19,42 @@ FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to also start at poweron FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it PACKAGECONFIG:append:witherspoon = " json" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 01df2ea5b..3e53f9d08 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 272a8a1f5..6bb236463 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,10 +5,10 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 57fb62b35..f734bf530 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test and OperationalStatus monitor feature for diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 8d6e64073..6a0e18189 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -41,7 +41,7 @@ DBUS_SERVICE:${PN} += "${SERVICE}" #The BindsTo in the service will not do the restart, it will only do the #original start and a stop. LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" +SYSTEMD_LINK:${PN} += "${LOG_FMT}" do_install:append(){ diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 9acaad768..c8d6a4617 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -21,4 +21,4 @@ do_install:append(){ FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4c4c88401..74bb9a0c5 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -13,4 +13,4 @@ TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" -SYSTEMD_LINK_${PN} += "${SYNC_FMT}" +SYSTEMD_LINK:${PN} += "${SYNC_FMT}" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 080025ead..7932eb3a0 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -106,16 +106,16 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 7d904461f..e2f146854 100644 --- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # utilize a 600s default timer config for p10bmc -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " obmc/watchdog/poweron" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index 4aebf6f24..b272dfe31 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_avsbus.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 3c7b92eaa..903ce4545 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_vcs.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 005a1e497..ce9c697de 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,5 +7,5 @@ INSTFMT = "phosphor-gpio-presence@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" +SYSTEMD_LINK:${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 1ce381522..07b7a382c 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -33,5 +33,5 @@ ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" # compose_list is not defined immediately so don't use := -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 319cd1658..79a13f695 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -14,8 +14,8 @@ FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 5fd911433..aa3b357a2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index 38efc160d..427018808 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -6,7 +6,7 @@ SRC_URI += "file://psu.json" PACKAGECONFIG:append = " monitor" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" do_install:append() { install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index aacdd181a..4f8fd6e8b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -26,5 +26,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 867c388bd..863f59c38 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -16,4 +16,4 @@ ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb index 956a62377..89b5b83e6 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://lanyang_avsbus.sh" RDEPENDS_${PN} += "i2c-tools" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index eb8196ff3..deeb2f9eb 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-inventec/meta-lanyang/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_lanyang := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_lanyang := " ${@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_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 7a2345ebc..4098609cb 100644 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,4 +15,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9a26ca04e..1e0803c06 100644 --- a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -12,4 +12,4 @@ HR855XG2_ITEMS += "iio-hwmon.conf" HR855XG2_ITEMS += "iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass index 61822f1d4..d37ebc30e 100644 --- a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass +++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass @@ -26,8 +26,8 @@ HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target" CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-vpnor-check-clearvolatile@{0}.service" CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" # Chassis target installation - always enable and clear in chassis # power on @@ -36,5 +36,5 @@ ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_ CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 5255be429..9df8193be 100644 --- a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend:df-openpower := "${THISDIR}/${PN}:" -SYSTEMD_OVERRIDE_${PN}-updater:append:df-openpower = \ +SYSTEMD_OVERRIDE:${PN}-updater:append:df-openpower = \ " software-bmc-updater.conf:xyz.openbmc_project.Software.BMC.Updater.service.d/software-bmc-updater.conf" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index a76acb44c..05d07ddb8 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -18,5 +18,5 @@ FMT_SCAN_HOST = "../${TMPL_SCAN}:${TGTFMT_HOST}.wants/${INSTFMT_SCAN}" SYSTEMD_SERVICE:${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 83f3a3e03..9b1b1c4c5 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')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index 0a189e8c6..d779785e4 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -17,4 +17,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index f735c0f82..549bbe242 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-host-startmin@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 3903ef616..440829175 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -55,8 +55,8 @@ OCC_TMPL = "op-occ-{0}@.service" HOST_TGTFMT = "obmc-host-{1}@{2}.target" OCC_INSTFMT = "op-occ-{0}@{2}.service" HOST_OCC_FMT = "../${OCC_TMPL}:${HOST_TGTFMT}.wants/${OCC_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" # Set the occ disable service to be executed on host error HOST_ERROR_TARGETS = "crash timeout" @@ -66,7 +66,7 @@ HOST_ERROR_TGTFMT = "obmc-host-{0}@{1}.target" OCC_DISABLE_INSTFMT = "op-occ-disable@{1}.service" HOST_ERROR_FMT = "../${OCC_DISABLE_TMPL}:${HOST_ERROR_TGTFMT}.wants/${OCC_DISABLE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" S = "${WORKDIR}/git" diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index baea3af02..c67fc021f 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -25,16 +25,16 @@ # SYSTEMD_USER_${unit}.service = "foo" # The user for the unit/package. # -# SYSTEMD_ENVIRONMENT_FILE_${PN} = "foo" +# SYSTEMD_ENVIRONMENT_FILE:${PN} = "foo" # One or more environment files to be installed. # -# SYSTEMD_LINK_${PN} = "tgt:name" +# SYSTEMD_LINK:${PN} = "tgt:name" # A specification for installing arbitrary links in # the ${systemd_system_unitdir} namespace, where: # tgt: the link target # name: the link name, relative to ${systemd_system_unitdir} # -# SYSTEMD_OVERRIDE_${PN} = "src:dest" +# SYSTEMD_OVERRIDE:${PN} = "src:dest" # A specification for installing unit overrides where: # src: the override file template # dest: the override install location, relative to ${systemd_system_unitdir} @@ -230,11 +230,11 @@ python() { unit_exist = check_sd_unit(d, unit) add_sd_unit(d, unit, pkg, unit_exist) add_sd_user(d, unit.name, pkg) - for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE_%s' % pkg): + for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE:%s' % pkg): add_env_file(d, name, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_LINK_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_LINK:%s' % pkg): install_link(d, spec, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE:%s' % pkg): add_override(d, spec, pkg) } diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index 84403d57b..b21440d89 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -12,4 +12,4 @@ INSTFMT = "host-failure-reboots@{0}.service" LINK_FMT = "${TMPL}:${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8c0394f2a..8e0e38a0c 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -24,7 +24,7 @@ SYSTEMD_SERVICE:${PN} += " \ op-powered-off@.service \ " -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/power_control" START_TMPL = "op-power-start@.service" START_TGTFMT = "obmc-chassis-poweron@{1}.target" @@ -59,38 +59,38 @@ RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" # Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target" START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Chassis off requires host off STOP_TMPL_CTRL = "obmc-host-stop@.target" STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" # Hard power off requires chassis off HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 9e0149382..0cf6a5968 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -60,10 +60,10 @@ FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" # JSON mode also gets linked into multi-user -SYSTEMD_LINK_${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" # Package the JSON config files installed from the repo @@ -105,10 +105,10 @@ SYSTEMD_SERVICE:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', # JSON: Linked to multi-user and poweron # YAML: Linked to fans-ready and fan control-init poweron -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -141,11 +141,11 @@ SYSTEMD_SERVICE:${PN}-monitor += "${TMPL_MONITOR}" SYSTEMD_SERVICE:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" # JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -163,4 +163,4 @@ PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monit FILES:sensor-monitor += " ${bindir}/sensor-monitor" SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" -SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" +SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb index 1a6d165b2..ffe2f366e 100644 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -23,4 +23,4 @@ START_TGTFMT = "obmc-host-startmin@{1}.target" START_INSTFMT = "op-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 1a1199f73..03d4e4f2f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -103,7 +103,7 @@ FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" #Collect all hardcoded sensor yamls from different recipes and #merge all of them with sensor.yaml. diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 341c5f73b..3bfd47d05 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -39,7 +39,7 @@ DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" @@ -47,10 +47,10 @@ TMPLFMT = "obmc-led-group-{1}@.service" TGTFMT = "obmc-chassis-{0}@0.target" INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index c7273a032..3f2ae8622 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -37,7 +37,7 @@ FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "mboxd.service" SYSTEMD_SERVICE:${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" # Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 83939c468..408096698 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -174,12 +174,12 @@ SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" SRCREV = "0d1c3f1f9329c853677f0581287afef83eeea0f0" diff --git a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb index 57e217450..8480bc60b 100644 --- a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb +++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb @@ -26,4 +26,4 @@ do_install() { } SYSTEMD_SERVICE:${PN} += "fbterm.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "fbterm" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "fbterm" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index b0d9c61cd..d0c91bf0f 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -28,10 +28,10 @@ EXTRA_OEMESON = " \ " # Copies config file having arguments for host watchdog -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/watchdog/poweron" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" # For now, watching PowerOn is the only usecase OBMC_HOST_WATCHDOG_INSTANCES = "poweron" @@ -51,5 +51,5 @@ ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" WATCHDOG_FMT = "../${WATCHDOG_TMPL}:obmc-host-startmin@{1}.target.wants/${WATCHDOG_TGTFMT}" ENABLE_WATCHDOG_FMT = "../${ENABLE_WATCHDOG_TMPL}:obmc-host-startmin@{0}.target.wants/${ENABLE_WATCHDOG_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb index fb9a728e3..0ac6c8ecd 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb @@ -19,9 +19,9 @@ FMT_REMOVE = "../${IR_REMOVE}:${TGTFMT_OFF}.wants/${INSTIR_REMOVE}" FMT_ADD = "../${IR_ADD}:${TGTFMT_ON}.requires/${INSTIR_ADD}" SYSTEMD_SERVICE_${PN} += "${IR_REMOVE}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${IR_ADD}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://ir38163_workaround.sh" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 195626d7a..ec17b3bbf 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-f0b/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:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:f0b := " ${@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:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 12d043cc4..1066cb215 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -19,4 +19,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index edf81760f..c9a0c38c3 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -8,25 +8,25 @@ TMPL_PRESENT = "phosphor-gpio-presence@.service" INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service" PRESENT_TGT = "multi-user.target" FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-0.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-1.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-2.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-3.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-4.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-5.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-6.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-7.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-8.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-9.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-10.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-11.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-0.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-1.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-2.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-3.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-4.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-5.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-6.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-7.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-8.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-9.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-10.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-11.conf" GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11" -SYSTEMD_LINK_${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" do_install:append:gbs() { install -d ${D}${systemd_system_unitdir} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index f36178d35..b9ea43e1c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -11,14 +11,14 @@ 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:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs := " ${@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:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" EXTRA_OECONF:append:gbs = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 657684d7a..723ac418d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -22,12 +22,12 @@ GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}" GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 23b063fc3..7ad4e2521 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " obmc/watchdog/host0" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " obmc/watchdog/host0" OBMC_HOST_WATCHDOG_INSTANCES_A = "host0" WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service" -SYSTEMD_OVERRIDE_${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_OVERRIDE:${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \ phosphor-host-watchdog-reset.service \ phosphor-host-watchdog-poweroff.service \ diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 2fb5443fb..d8e2cb14e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/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:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj := " ${@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:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4363aa352..a27865239 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,9 +15,9 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 4db5c6501..04f25c1b0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -17,11 +17,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:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "${SYSTEMD_DEFAULT_TARGET}" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9874bc875..54b7ac14f 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -24,7 +24,7 @@ ITEMS = " \ " ENVS = "obmc/hwmon/ahb/apb/{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # PECI PECINAMES = " \ @@ -35,6 +35,6 @@ PECINAMES = " \ PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf" PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}" PECIENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" EXTRA_OEMESON:append:olympus-nuvoton = " -Dupdate-functional-on-fail=true" 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" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb index 3e376e12b..59025ad62 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 8988ff1af..3038ad0b6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -13,5 +13,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend index cdd6bf0e7..dce22fc1c 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" -- cgit v1.2.3 From 43af456b978e7aaeb917baa32be85f89cb2ad17c Mon Sep 17 00:00:00 2001 From: Ali Ahmed Date: Thu, 19 Aug 2021 13:08:13 -0500 Subject: Remove phosphor-webui from witherspoon systems Witherspoon systems are currently used for CI. Currently, CI does not test the webui. This change will affect Swift systems, as swift.conf requires witherspoon.conf. Additionally, removing phosphor-webui saves us 397 kB in filesystem sz. Built up-to-date images to see the size of the rootfs.squashfs-xz The size of obmc-phosphor-image-witherspoon-.rootfs.squashfs-xz: 1) With webui-vue: 19.836928 MB 2) With phosphor-webui: 19.78368 MB 3) Without either (i.e. this change): 19.386368 MB. Testing using commit 7d637776938c77d69752a72a09edc90ebde93164: 1) Code update successful on hardware system. HW system updated image and rebooted successfully Signed-off-by: Ali Ahmed Change-Id: Ib2488dd462851b98f557dd9c76086d48dcbe905c --- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c74ca984b..db7099157 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -27,7 +27,7 @@ RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-contr RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog" RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor" -RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync" RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" RDEPENDS:${PN}-extras:append:mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" @@ -36,7 +36,7 @@ RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vu RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS:${PN}-host-state-mgmt:remove:p10bmc = "checkstop-monitor" RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm" -RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" +RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS:${PN}-logging:append = " ${EXTRA_IBM_LOGGING_PKGS}" RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor" -- cgit v1.2.3 From b321d51e176a429d9d3c555e8a4b68abb428841d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Sep 2021 22:01:08 +0000 Subject: ibm-logging: srcrev bump 074d53b723..1eb63675af Matt Spinler (1): Switch SdBusError to generic sdbusplus exception Change-Id: I9fad0117559672b860270d86fb2538b649b3ee28 Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 6a0e18189..ec9edcc18 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "074d53b723a26a50b628387c635a97c730555bce" +SRCREV = "1eb63675af793e9c183c89afdb6e0d5a428b727d" inherit autotools inherit pkgconfig -- cgit v1.2.3 From 5b587cab386c4691eefa4885b9fd30794934c106 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:33:36 -0500 Subject: meta-phosphor: make discovery bbclass use override syntax In the spirit of consistency with the new upstream override syntax, change phosphor-discovery-service.bbclass to use it and make tree-wide changes as appropriate. After the change checked on Witherspoon on QEMU: ``` root@witherspoon:/etc/avahi/services# ls obmc_console.service obmc_redfish.service obmc_rest.service ``` Signed-off-by: Patrick Williams Change-Id: Ib1fe3cce57a0130378af789abd83b457e0c3a318 --- meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend | 4 ++-- meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend | 4 ++-- meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass | 4 ++-- meta-phosphor/recipes-phosphor/console/obmc-console_git.bb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index 9360e2128..2ca97e165 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -30,7 +30,7 @@ install_concurrent_console_config() { SRC_URI:append:p10bmc = " file://client.2201.conf" SRC_URI:append:p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ @@ -48,7 +48,7 @@ do_install:append:p10bmc() { SRC_URI:append:witherspoon-tacoma = " file://client.2201.conf" SRC_URI:append:witherspoon-tacoma = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:witherspoon-tacoma = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 659eafd74..8e06233b0 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -5,5 +5,5 @@ EXTRA_OEMESON:append = " \ inherit obmc-phosphor-discovery-service -REGISTERED_SERVICES_${PN} += "obmc_redfish:tcp:443:" -REGISTERED_SERVICES_${PN} += "obmc_rest:tcp:443:" +REGISTERED_SERVICES:${PN} += "obmc_redfish:tcp:443:" +REGISTERED_SERVICES:${PN} += "obmc_rest:tcp:443:" diff --git a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass index 4afd9e0bd..5b12faa4d 100644 --- a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass @@ -24,7 +24,7 @@ python() { for pkg in listvar_to_list(d, 'DISCOVERY_SVC_PACKAGES'): - for service in listvar_to_list(d, 'REGISTERED_SERVICES_%s' % pkg): + for service in listvar_to_list(d, 'REGISTERED_SERVICES:%s' % pkg): if avahi_enabled: set_doappend(d, 'RRECOMMENDS:%s' % pkg, 'avahi-daemon') svc_name, svc_type, svc_port, svc_txt_data = service.split(':') @@ -95,7 +95,7 @@ python discovery_services_postinstall() { fd.write('%s %s %s' % (service_name, service_type, service_port)) def register_services(d,pkg): - for service in listvar_to_list(d, 'REGISTERED_SERVICES_%s' % pkg): + for service in listvar_to_list(d, 'REGISTERED_SERVICES:%s' % pkg): svc_info = service.split(":") try: svc_name, svc_type, svc_port, svc_txt_data = svc_info diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 70d2fe99b..62efcdb89 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -29,7 +29,7 @@ SRC_URI += "file://${BPN}.conf" SRCREV = "cabd9db06da91ecf2198c1baaf20360d1424c2f3" PV = "1.0+git${SRCPV}" -REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200:" +REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ obmc-console-ssh.socket \ -- cgit v1.2.3 From debf2b5d689c9d308bc752f5aab3367c05152dc3 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 2 Sep 2021 13:20:09 +0800 Subject: meta-phosphor: rename mctp package to libmctp We're about to introduce a package for mctp utilities, called 'mctp'. However, the libmctp package already uses that name. This change renames 'mctp' to the upstream name of 'libmctp'. Signed-off-by: Jeremy Kerr Change-Id: Ia49a40c822e920d3bc36584cbc2c97b83828cfdd --- .../recipes-phosphor/libmctp/files/p10bmc/mctp | 1 + .../libmctp/files/witherspoon-tacoma/mctp | 1 + .../recipes-phosphor/libmctp/libmctp_%.bbappend | 7 ++++ meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp | 1 - .../mctp/files/witherspoon-tacoma/mctp | 1 - meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend | 7 ---- .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- .../recipes-phosphor/libmctp/libmctp_%.bbappend | 10 ++++++ .../recipes-phosphor/libmctp/mctp/mctp | 2 ++ .../meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp | 2 -- .../recipes-phosphor/mctp/mctp_%.bbappend | 10 ------ .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- .../recipes-phosphor/libmctp/files/default | 1 + .../recipes-phosphor/libmctp/libmctp_git.bb | 37 ++++++++++++++++++++++ meta-phosphor/recipes-phosphor/mctp/files/default | 1 - meta-phosphor/recipes-phosphor/mctp/mctp_git.bb | 37 ---------------------- 16 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp create mode 100644 meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp create mode 100644 meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend delete mode 100644 meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp delete mode 100644 meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp delete mode 100644 meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend create mode 100644 meta-phosphor/recipes-phosphor/libmctp/files/default create mode 100644 meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb delete mode 100644 meta-phosphor/recipes-phosphor/mctp/files/default delete mode 100644 meta-phosphor/recipes-phosphor/mctp/mctp_git.bb (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp b/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp new file mode 100644 index 000000000..f9062205b --- /dev/null +++ b/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp @@ -0,0 +1 @@ +DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp b/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp new file mode 100644 index 000000000..f9062205b --- /dev/null +++ b/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp @@ -0,0 +1 @@ +DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend new file mode 100644 index 000000000..e69ed5c9a --- /dev/null +++ b/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI:append:p10bmc = " file://mctp" +SRC_URI:append:witherspoon-tacoma = " file://mctp" + +PACKAGECONFIG:append:p10bmc = " astlpc-raw-kcs" +PACKAGECONFIG:append:witherspoon-tacoma = " astlpc-raw-kcs" diff --git a/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp b/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp deleted file mode 100644 index f9062205b..000000000 --- a/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp +++ /dev/null @@ -1 +0,0 @@ -DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp b/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp deleted file mode 100644 index f9062205b..000000000 --- a/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp +++ /dev/null @@ -1 +0,0 @@ -DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend deleted file mode 100644 index e69ed5c9a..000000000 --- a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append:p10bmc = " file://mctp" -SRC_URI:append:witherspoon-tacoma = " file://mctp" - -PACKAGECONFIG:append:p10bmc = " astlpc-raw-kcs" -PACKAGECONFIG:append:witherspoon-tacoma = " astlpc-raw-kcs" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index db7099157..acd8c6ba2 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -29,7 +29,7 @@ RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog" RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor" RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync" RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" -RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" +RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger libmctp" RDEPENDS:${PN}-extras:append:mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend new file mode 100644 index 000000000..af2869b58 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://mctp" + +PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs" + +do_install:append() { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp new file mode 100644 index 000000000..2d5f2465e --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp @@ -0,0 +1,2 @@ +DEMUX_BINDING_OPTS=astlpc + diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp deleted file mode 100644 index 2d5f2465e..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp +++ /dev/null @@ -1,2 +0,0 @@ -DEMUX_BINDING_OPTS=astlpc - diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend deleted file mode 100644 index af2869b58..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://mctp" - -PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs" - -do_install:append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp -} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c6d0bd98d..dc8135f27 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -17,7 +17,7 @@ RDEPENDS:${PN}-extras:append:fp5280g2 = " \ ${POWER_SERVICE_PACKAGES_FP5280G2} \ phosphor-led-manager \ pldm \ - mctp \ + libmctp \ phosphor-fp5280g2-psu-update \ phosphor-psu-software-manager \ biosconfig-manager \ diff --git a/meta-phosphor/recipes-phosphor/libmctp/files/default b/meta-phosphor/recipes-phosphor/libmctp/files/default new file mode 100644 index 000000000..cb33e8b61 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/libmctp/files/default @@ -0,0 +1 @@ +DEMUX_BINDING_OPTS=null diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb new file mode 100644 index 000000000..54d6b73e4 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -0,0 +1,37 @@ +SUMMARY = "MCTP stack" +DESCRIPTION = "MCTP library implementing the MCTP base specification" +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit systemd +inherit autotools pkgconfig + +HOMEPAGE = "https://github.com/openbmc/libmctp" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" +SRC_URI = "git://github.com/openbmc/libmctp \ + file://default" +SRCREV = "edebe169ebefd6410d74850bbce1ea599c347753" + +DEPENDS += "autoconf-archive-native \ + systemd \ + " + +SYSTEMD_SERVICE:${PN} = "mctp-demux.service \ + mctp-demux.socket \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ + --without-systemdsystemunitdir,systemd" + +PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev" + +CONFFILES:${PN} = "${sysconfdir}/default/mctp" + +do_install:append() { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/mctp +} + +S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mctp/files/default b/meta-phosphor/recipes-phosphor/mctp/files/default deleted file mode 100644 index cb33e8b61..000000000 --- a/meta-phosphor/recipes-phosphor/mctp/files/default +++ /dev/null @@ -1 +0,0 @@ -DEMUX_BINDING_OPTS=null diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb deleted file mode 100644 index 54d6b73e4..000000000 --- a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "MCTP stack" -DESCRIPTION = "MCTP library implementing the MCTP base specification" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit systemd -inherit autotools pkgconfig - -HOMEPAGE = "https://github.com/openbmc/libmctp" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" -SRC_URI = "git://github.com/openbmc/libmctp \ - file://default" -SRCREV = "edebe169ebefd6410d74850bbce1ea599c347753" - -DEPENDS += "autoconf-archive-native \ - systemd \ - " - -SYSTEMD_SERVICE:${PN} = "mctp-demux.service \ - mctp-demux.socket \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdsystemunitdir,systemd" - -PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev" - -CONFFILES:${PN} = "${sysconfdir}/default/mctp" - -do_install:append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/mctp -} - -S = "${WORKDIR}/git" -- cgit v1.2.3 From f0cb8b88e763dee891f6c7b88a2547cd092cf8af Mon Sep 17 00:00:00 2001 From: Ramesh Iyyar Date: Fri, 27 Aug 2021 12:01:28 -0500 Subject: meta-ibm: Added a setting for the HardwareIsolation - In this patch, added a setting to enable or disable the HardwareIsolation (aka Guard) in the OpenPOWER based system. - By default, the setting is enabled, that's means the HardwareIsolation feature is enabled for the IBM system so, the respective BMC components need to take care of the functionality based on the roles of each application usage by using this setting if needs. Signed-off-by: Ramesh Iyyar Change-Id: If03c98b74f5bc26941ddc825cde81ea307518742 --- .../settings/phosphor-settings-manager/ibm_settings.override.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml index 4dc4f473c..37dace693 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml @@ -15,3 +15,9 @@ Properties: PowerMode: Default: Mode::PowerMode::MaximumPerformance + +/xyz/openbmc_project/hardware_isolation/allow_hw_isolation: + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'true' -- cgit v1.2.3 From 3775b4ff64a610b4743265308286df9ce7385c49 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Sep 2021 14:31:24 +0000 Subject: pldm: srcrev bump e5bbe0d055..0922275b3b Adriana Kobylak (1): oem: ibm: Add services to reset PHYP NVRAM Tom Joseph (1): tools: Extend pldm_fwup_pkg_creator Change-Id: I9dce25f3137a938c84dd080eaa8f37aa5a5147eb Signed-off-by: Andrew Geissler Signed-off-by: Adriana Kobylak --- meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 7 ++++++- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index e2e7c2374..273df37b0 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -5,4 +5,9 @@ EXTRA_OEMESON:append = " \ -Dresponse-time-out=4800 \ " -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', \ + 'pldm-create-phyp-nvram.service \ + pldm-create-phyp-nvram-cksum.service \ + pldm-reset-phyp-nvram.service \ + pldm-reset-phyp-nvram-cksum.service \ + ', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 736048cf8..dd5fa1347 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "e5bbe0d0555f25ac3d7ba2a7dbd99dfb59c38f45" +SRCREV = "0922275b3b575e4c8e70b837818b9d0a0afe9eac" -- cgit v1.2.3 From 0b4f549c37acc2826c9a94bb61d1e6591c74fde5 Mon Sep 17 00:00:00 2001 From: Abhishek Patel Date: Mon, 19 Jul 2021 08:24:26 -0500 Subject: Webui-vue builds with IBM environment variables To build webui-vue with IBM theme, need to set IBM environment variable during the webui-vue build. Yocto has many layers of abstraction. To specify IBM environment variables, we use --mode npm build Commandline argument, which helps to set IBM environment variables. We need to set this environment variable during IBM build only. So created webui-vue_%.bbappend file, which sets that env variable only for IBM builds. More information could be found at https://github.com/openbmc/webui-vue/blob/master/docs/customization/build.md Tested with IBM build. Signed-off-by: Abhishek Patel Change-Id: I6ff997a94eb59b695741ccca95acb7693a4714ff --- meta-ibm/recipes-phosphor/webui/webui-vue_%.bbappend | 4 ++++ meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 meta-ibm/recipes-phosphor/webui/webui-vue_%.bbappend (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibm/recipes-phosphor/webui/webui-vue_%.bbappend new file mode 100644 index 000000000..fe11d70df --- /dev/null +++ b/meta-ibm/recipes-phosphor/webui/webui-vue_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +EXTRA_OENPM:witherspoon-tacoma = "-- --mode ibm" +EXTRA_OENPM:p10bmc = "-- --mode ibm" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 3059a55af..e55072303 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -30,11 +30,13 @@ export CXXFLAGS = "${BUILD_CXXFLAGS}" FILES:${PN} += "${datadir}/www/*" +EXTRA_OENPM ?= "" + do_compile () { cd ${S} rm -rf node_modules npm --loglevel info --proxy=${http_proxy} --https-proxy=${https_proxy} install - npm run build + npm run build ${EXTRA_OENPM} } do_install () { -- cgit v1.2.3 From b06aaf02d0ab30acadf16b6126adef111b7585bb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 4 Aug 2021 13:05:12 -0500 Subject: dbus-monitor: add dependency on snmp service All IBM systems support the SNMP trap notification for error logs. This means phosphor-dbus-monitor needs to be careful to not start until the SNMP service is up and running. Without this dependency, situations can be hit, when lots of errors are present, where the phosphor-dbus-monitor calls into the SNMP shared library and hits an unhandled exception when trying to talk to the SNMP service. Tested: - Verified the unhandled exception is no longer seen and phosphor-dbus-monitor starts after the SNMP service. Signed-off-by: Andrew Geissler Change-Id: I8b4ca94c0cdd7721aa8847dc478f3827f040a654 --- .../dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf | 3 +++ meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf new file mode 100644 index 000000000..6b4f7f5d0 --- /dev/null +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf @@ -0,0 +1,3 @@ +[Unit] +Wants=mapper-wait@-xyz-openbmc_project-network-snmp.service +After=mapper-wait@-xyz-openbmc_project-network-snmp.service diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 6731a7abb..78d2d495f 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_OVERRIDE:${PN}:append = " phosphor-dbus-monitor-snmp.conf:phosphor-dbus-monitor.service.d/phosphor-dbus-monitor-snmp.conf" -- cgit v1.2.3