diff options
Diffstat (limited to 'meta-ibm')
22 files changed, 2242 insertions, 99 deletions
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 2cab74e4d..58319bf84 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -5,8 +5,6 @@ SPL_BINARY = "spl/u-boot-spl.bin" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" -# TODO remove the MACHINEOVERRIDES when the rainier.conf file is removed. -MACHINEOVERRIDES =. "p10bmc:" require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc @@ -15,6 +13,7 @@ require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc +DISTRO_FEATURES += "ibm-service-account-policy" SERIAL_CONSOLES = "115200;ttyS4" @@ -34,3 +33,23 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ SKIP_BROKEN_MRW = "1" 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" +FIT_SIGN_NUMBITS = "4096" +UBOOT_FITIMAGE_ENABLE = "1" +UBOOT_FIT_HASH_ALG = "sha512" +UBOOT_FIT_SIGN_ALG = "rsa4096" +UBOOT_FIT_SIGN_NUMBITS = "4096" + +UBOOT_SIGN_KEYNAME = "rsa_oem_fitimage_key" +SPL_SIGN_KEYNAME = "rsa_oem_fitimage_key" + +UBOOT_SIGN_KEYDIR = "${WORKDIR}" +SPL_SIGN_KEYDIR = "${WORKDIR}" diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf deleted file mode 120000 index ddfb6ec6d..000000000 --- a/meta-ibm/conf/machine/rainier.conf +++ /dev/null @@ -1 +0,0 @@ -p10bmc.conf
\ No newline at end of file diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 9826d55ec..2d696ecd8 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -14,6 +14,7 @@ require conf/distro/include/ibm-yaml.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc +DISTRO_FEATURES += "ibm-service-account-policy" SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf new file mode 100644 index 000000000..a9f1d5723 --- /dev/null +++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf @@ -0,0 +1,8 @@ +# This file overrides a default for journald +# +# - Set a maximum size for journald in filesystem +# +# See journald.conf(5) for details + +[Journal] +SystemMaxUse=16M diff --git a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf index fb84c6734..fb84c6734 100644 --- a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf +++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index a6ef71d29..3e490153d 100644 --- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend @@ -1,11 +1,11 @@ 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.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.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" @@ -18,10 +18,10 @@ FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-p 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.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.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() { 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.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.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 new file mode 100644 index 000000000..f4254e7ba --- /dev/null +++ b/meta-ibm/recipes-extended/sudo/sudo_%.bbappend @@ -0,0 +1,8 @@ +# Allow passwordless use of sudo + +PACKAGECONFIG += "pam-wheel" + +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-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json index 74bcfc425..632c76b52 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json @@ -2,8 +2,8 @@ "fans": [ { "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -12,18 +12,20 @@ "sensors": [ { "name": "fan0_0", + "threshold": 30, "has_target": true }, { "name": "fan0_1", + "threshold": 30, "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan1", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -32,18 +34,20 @@ "sensors": [ { "name": "fan1_0", + "threshold": 30, "has_target": true }, { "name": "fan1_1", + "threshold": 30, "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan2", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -52,18 +56,20 @@ "sensors": [ { "name": "fan2_0", + "threshold": 30, "has_target": true }, { "name": "fan2_1", + "threshold": 30, "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan3", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -72,10 +78,12 @@ "sensors": [ { "name": "fan3_0", + "threshold": 30, "has_target": true }, { "name": "fan3_1", + "threshold": 30, "has_target": false } ] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json index 737cb3f3b..eb519d9b4 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json @@ -2,8 +2,8 @@ "fans": [ { "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -12,14 +12,15 @@ "sensors": [ { "name": "fan0_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan1", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -28,14 +29,15 @@ "sensors": [ { "name": "fan1_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan2", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -44,14 +46,15 @@ "sensors": [ { "name": "fan2_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan4", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -60,6 +63,7 @@ "sensors": [ { "name": "fan4_0", + "threshold": 30, "has_target": true } ] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json index 145e37f38..b4143adba 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json @@ -2,8 +2,8 @@ "fans": [ { "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -12,20 +12,22 @@ "sensors": [ { "name": "fan0_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan0_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan1", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -34,20 +36,22 @@ "sensors": [ { "name": "fan1_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan1_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan2", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -56,20 +60,22 @@ "sensors": [ { "name": "fan2_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan2_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan3", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -78,20 +84,22 @@ "sensors": [ { "name": "fan3_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan3_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan4", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -100,20 +108,22 @@ "sensors": [ { "name": "fan4_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan4_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] }, { "inventory": "/system/chassis/motherboard/fan5", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -122,13 +132,15 @@ "sensors": [ { "name": "fan5_0", - "has_target": true + "threshold": 30, + "has_target": true, + "factor": 0.627, + "offset": 750 }, { "name": "fan5_1", - "has_target": false, - "factor": 1.45, - "offset": -909 + "threshold": 30, + "has_target": false } ] } diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json index 71a489944..1bfb5378b 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json @@ -2,8 +2,8 @@ "fans": [ { "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -12,14 +12,15 @@ "sensors": [ { "name": "fan0_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan1", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -28,14 +29,15 @@ "sensors": [ { "name": "fan1_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan2", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -44,14 +46,15 @@ "sensors": [ { "name": "fan2_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan3", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -60,14 +63,15 @@ "sensors": [ { "name": "fan3_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan4", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -76,14 +80,15 @@ "sensors": [ { "name": "fan4_0", + "threshold": 30, "has_target": true } ] }, { "inventory": "/system/chassis/motherboard/fan5", - "functional_delay": 5, - "allowed_out_of_range_time": 30, + "method": "count", + "count_interval": 1, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, "monitor_start_delay": 30, @@ -92,6 +97,7 @@ "sensors": [ { "name": "fan5_0", + "threshold": 30, "has_target": true } ] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json index 439aedcac..928eca25e 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json @@ -6,7 +6,7 @@ { "type": "gpio", "key": 15, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "physpath": "/sys/bus/i2c/devices/30-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -28,7 +28,7 @@ { "type": "gpio", "key": 14, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "physpath": "/sys/bus/i2c/devices/30-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -50,7 +50,7 @@ { "type": "gpio", "key": 13, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "physpath": "/sys/bus/i2c/devices/30-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -72,7 +72,7 @@ { "type": "gpio", "key": 12, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "physpath": "/sys/bus/i2c/devices/30-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json index 5bcda88b3..65697e557 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json @@ -6,7 +6,7 @@ { "type": "gpio", "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -27,7 +27,7 @@ { "type": "gpio", "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -48,7 +48,7 @@ { "type": "gpio", "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -69,7 +69,7 @@ { "type": "gpio", "key": 10, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json index 726451028..a5cc1bf66 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json @@ -6,7 +6,7 @@ { "type": "gpio", "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -28,7 +28,7 @@ { "type": "gpio", "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -50,7 +50,7 @@ { "type": "gpio", "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -72,7 +72,7 @@ { "type": "gpio", "key": 9, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -94,7 +94,7 @@ { "type": "gpio", "key": 10, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -116,7 +116,7 @@ { "type": "gpio", "key": 11, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json index 94e7e69f8..620a32907 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json @@ -6,7 +6,7 @@ { "type": "gpio", "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -27,7 +27,7 @@ { "type": "gpio", "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -48,7 +48,7 @@ { "type": "gpio", "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -69,7 +69,7 @@ { "type": "gpio", "key": 9, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -90,7 +90,7 @@ { "type": "gpio", "key": 10, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -111,7 +111,7 @@ { "type": "gpio", "key": 11, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "physpath": "/sys/bus/i2c/devices/7-0061", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json index 36cdae85b..52262fe35 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json @@ -6,7 +6,7 @@ { "type": "gpio", "key": 4, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060", + "physpath": "/sys/bus/i2c/devices/3-0060", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -28,7 +28,7 @@ { "type": "gpio", "key": 5, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060", + "physpath": "/sys/bus/i2c/devices/3-0060", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -50,7 +50,7 @@ { "type": "gpio", "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060", + "physpath": "/sys/bus/i2c/devices/3-0060", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { @@ -72,7 +72,7 @@ { "type": "gpio", "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060", + "physpath": "/sys/bus/i2c/devices/3-0060", "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" }, { diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 403bfa0cc..57260f06b 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -5,3 +5,61 @@ 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" + +# Optionally configure IBM service accounts +# +# To configure your distro, add the following line to its config: +# DISTRO_FEATURES += "ibm-service-account-policy" +# +# The service account policy is as follows: +# root - The root account remains present. It is needed for internal +# accounting purposes and for debugging service access. +# admin - Provides administrative control over the BMC. The role is +# SystemAdministrator. Admin users have access to interfaces including: +# Redfish, REST APIs, Web. No access to the BMC via: the BMC's physical +# console, SSH to the BMC's command line. +# IPMI access is not granted by default, but admins can authorize +# themselves and enable the IPMI service. +# The admin has access to the host console: ssh -p2200 admin@${bmc}. +# The admin account does not have a home directory. +# service - Provides IBM service and support representatives (SSRs, formerly +# known as customer engineers or CEs) access to the BMC. The role is +# OemIBMServiceAgent. The service user has full admin access, plus access +# to BMC interfaces intended only to service the BMC and host, including +# SSH access to the BMC's command line. +# The service account is not authorized to IPMI because of the inherent +# security weakness in the IPMI spec and also because the IPMI +# implementation was not enhanced to use the ACF support. +# The service account does not have a home directory. The home directory is +# set to / (the root directory) to allow dropbear ssh connections. + +inherit extrausers + +# The password hash used here is the traditional 0penBmc password. + +#IBM_EXTRA_USERS_PARAMS += " \ +# usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ +# " + +# Add group "wheel" (before adding the "service" account). +IBM_EXTRA_USERS_PARAMS += " \ + groupadd wheel; \ + " + +# 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; \ + " + +# Add the "service" account. +IBM_EXTRA_USERS_PARAMS += " \ + useradd -M -d / --groups priv-admin,redfish,web,wheel service; \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' service; \ + " + +# 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)}" + +# The service account needs sudo. +IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', 'sudo', '', d)}" diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index bf797d94c..e1c085a3c 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -25,6 +25,28 @@ "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1" ] + }, + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan0_identify" + ] } ] }, @@ -43,6 +65,28 @@ "/xyz/openbmc_project/sensors/fan_tach/fan1_0", "/xyz/openbmc_project/sensors/fan_tach/fan1_1" ] + }, + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan1_identify" + ] } ] }, @@ -61,6 +105,28 @@ "/xyz/openbmc_project/sensors/fan_tach/fan2_0", "/xyz/openbmc_project/sensors/fan_tach/fan2_1" ] + }, + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan2_identify" + ] } ] }, @@ -79,6 +145,28 @@ "/xyz/openbmc_project/sensors/fan_tach/fan3_0", "/xyz/openbmc_project/sensors/fan_tach/fan3_1" ] + }, + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/fan3_identify" + ] } ] }, @@ -105,7 +193,1002 @@ ] } ] + }, + { + "path": "system/chassis/motherboard/powersupply0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply0_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply1_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply2_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply3_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/planar_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/planar_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/bmc", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/bmc_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/bmc_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/bmc/tod_battery", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/rtc_battery_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/rtc_battery_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm0_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm1_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm2_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm3_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm4_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm4_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm5_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm5_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm6", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm6_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm6_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm7", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm7_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm7_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm8", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm8_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm8_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm9", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm9_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm9_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm10", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm10_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm10_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm11", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm11_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm11_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm12", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm12_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm12_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm13", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm13_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm13_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm14", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm14_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm14_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/vrm15", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm15_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/vrm15_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/tpm", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/tpm_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/tpm_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/power_distribution", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/power_distribution_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/power_distribution_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu0_c14_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu0_c14_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu0_c14_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu0_c14_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu1_c19_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu1_c19_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu1_c19_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu1_c19_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu2_c56_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu2_c56_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu2_c56_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu2_c56_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu6", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu3_c61_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu3_c61_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu7", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu3_c61_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cpu3_c61_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/dasd_backplane_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/dasd_backplane_identify" + ] + } + ] } ] } - diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 348cb9755..65f389998 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -272,7 +272,28 @@ "/xyz/openbmc_project/sensors/fan_tach/fan3_0", "/xyz/openbmc_project/sensors/fan_tach/fan3_1", "/xyz/openbmc_project/sensors/fan_tach/fan4_0", - "/xyz/openbmc_project/sensors/fan_tach/fan4_1" + "/xyz/openbmc_project/sensors/fan_tach/fan4_1", + "/xyz/openbmc_project/sensors/fan_tach/fan5_0", + "/xyz/openbmc_project/sensors/fan_tach/fan5_1" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "assembly" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vdd_vrm0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vdd_vrm1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/tpm_wilson", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/tod_battery", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/base_op_panel_blyth", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane2" ] } ] @@ -302,6 +323,17 @@ [ "/xyz/openbmc_project/led/groups/powersupply0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -330,6 +362,17 @@ [ "/xyz/openbmc_project/led/groups/powersupply1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1590,6 +1633,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1618,6 +1672,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1646,6 +1711,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot2_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1674,6 +1750,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot3_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1702,6 +1789,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot4_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1730,6 +1828,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot6_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1758,6 +1867,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot7_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1786,6 +1906,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot8_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1814,6 +1945,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot9_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1842,6 +1984,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot10_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1870,6 +2023,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot11_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2206,6 +2370,17 @@ [ "/xyz/openbmc_project/led/groups/nvme0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2234,6 +2409,17 @@ [ "/xyz/openbmc_project/led/groups/nvme1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2262,6 +2448,17 @@ [ "/xyz/openbmc_project/led/groups/nvme2_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2290,6 +2487,17 @@ [ "/xyz/openbmc_project/led/groups/nvme3_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2318,6 +2526,17 @@ [ "/xyz/openbmc_project/led/groups/nvme4_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2346,6 +2565,17 @@ [ "/xyz/openbmc_project/led/groups/nvme5_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2374,6 +2604,17 @@ [ "/xyz/openbmc_project/led/groups/nvme6_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2402,6 +2643,17 @@ [ "/xyz/openbmc_project/led/groups/nvme7_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2430,6 +2682,17 @@ [ "/xyz/openbmc_project/led/groups/nvme8_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2458,6 +2721,17 @@ [ "/xyz/openbmc_project/led/groups/nvme9_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2486,6 +2760,17 @@ [ "/xyz/openbmc_project/led/groups/nvme10_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2514,6 +2799,17 @@ [ "/xyz/openbmc_project/led/groups/nvme11_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2542,6 +2838,17 @@ [ "/xyz/openbmc_project/led/groups/nvme12_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2570,6 +2877,17 @@ [ "/xyz/openbmc_project/led/groups/nvme13_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2598,6 +2916,17 @@ [ "/xyz/openbmc_project/led/groups/nvme14_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2626,6 +2955,17 @@ [ "/xyz/openbmc_project/led/groups/nvme15_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2654,6 +2994,17 @@ [ "/xyz/openbmc_project/led/groups/nvme16_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2682,6 +3033,17 @@ [ "/xyz/openbmc_project/led/groups/nvme17_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2710,6 +3072,17 @@ [ "/xyz/openbmc_project/led/groups/nvme18_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2738,6 +3111,17 @@ [ "/xyz/openbmc_project/led/groups/nvme19_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2766,6 +3150,17 @@ [ "/xyz/openbmc_project/led/groups/nvme20_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2794,6 +3189,17 @@ [ "/xyz/openbmc_project/led/groups/nvme21_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2822,6 +3228,17 @@ [ "/xyz/openbmc_project/led/groups/nvme22_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2850,6 +3267,17 @@ [ "/xyz/openbmc_project/led/groups/nvme23_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] } diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 7841a966a..5cda22d66 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -261,7 +261,27 @@ "/xyz/openbmc_project/sensors/fan_tach/fan1_0", "/xyz/openbmc_project/sensors/fan_tach/fan2_0", "/xyz/openbmc_project/sensors/fan_tach/fan3_0", - "/xyz/openbmc_project/sensors/fan_tach/fan4_0" + "/xyz/openbmc_project/sensors/fan_tach/fan4_0", + "/xyz/openbmc_project/sensors/fan_tach/fan5_0" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "assembly" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vdd_vrm0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vdd_vrm1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/tpm_wilson", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/tod_battery", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/base_op_panel_blyth", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane2" ] } ] @@ -291,6 +311,17 @@ [ "/xyz/openbmc_project/led/groups/powersupply0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -319,6 +350,95 @@ [ "/xyz/openbmc_project/led/groups/powersupply1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply2_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/powersupply3_identify" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1579,6 +1699,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1607,6 +1738,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1635,6 +1777,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot2_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1663,6 +1816,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot3_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1691,6 +1855,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot4_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1719,6 +1894,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot6_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1747,6 +1933,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot7_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1775,6 +1972,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot8_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1803,6 +2011,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot9_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1831,6 +2050,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot10_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -1859,6 +2089,17 @@ [ "/xyz/openbmc_project/led/groups/pcieslot11_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2195,6 +2436,17 @@ [ "/xyz/openbmc_project/led/groups/nvme0_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2223,6 +2475,17 @@ [ "/xyz/openbmc_project/led/groups/nvme1_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2251,6 +2514,17 @@ [ "/xyz/openbmc_project/led/groups/nvme2_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2279,6 +2553,17 @@ [ "/xyz/openbmc_project/led/groups/nvme3_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2307,6 +2592,17 @@ [ "/xyz/openbmc_project/led/groups/nvme4_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2335,6 +2631,17 @@ [ "/xyz/openbmc_project/led/groups/nvme5_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2363,6 +2670,17 @@ [ "/xyz/openbmc_project/led/groups/nvme6_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2391,6 +2709,17 @@ [ "/xyz/openbmc_project/led/groups/nvme7_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2419,6 +2748,17 @@ [ "/xyz/openbmc_project/led/groups/nvme8_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2447,6 +2787,17 @@ [ "/xyz/openbmc_project/led/groups/nvme9_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2475,6 +2826,17 @@ [ "/xyz/openbmc_project/led/groups/nvme10_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2503,6 +2865,17 @@ [ "/xyz/openbmc_project/led/groups/nvme11_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2531,6 +2904,17 @@ [ "/xyz/openbmc_project/led/groups/nvme12_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2559,6 +2943,17 @@ [ "/xyz/openbmc_project/led/groups/nvme13_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2587,6 +2982,17 @@ [ "/xyz/openbmc_project/led/groups/nvme14_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2615,6 +3021,17 @@ [ "/xyz/openbmc_project/led/groups/nvme15_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2643,6 +3060,17 @@ [ "/xyz/openbmc_project/led/groups/nvme16_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2671,6 +3099,17 @@ [ "/xyz/openbmc_project/led/groups/nvme17_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2699,6 +3138,17 @@ [ "/xyz/openbmc_project/led/groups/nvme18_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2727,6 +3177,17 @@ [ "/xyz/openbmc_project/led/groups/nvme19_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2755,6 +3216,17 @@ [ "/xyz/openbmc_project/led/groups/nvme20_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2783,6 +3255,17 @@ [ "/xyz/openbmc_project/led/groups/nvme21_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2811,6 +3294,17 @@ [ "/xyz/openbmc_project/led/groups/nvme22_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -2839,6 +3333,17 @@ [ "/xyz/openbmc_project/led/groups/nvme23_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "chassis" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] } diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index cf88f2282..a79dae669 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -4,7 +4,7 @@ SRC_URI += " file://ncsi-netlink.service" SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service" FILES_${PN} += "${datadir}/network/*.json" -EXTRA_OECONF += "--enable-sync-mac" +PACKAGECONFIG_append = " sync-mac" install_network_configuration(){ install -d ${D}${systemd_system_unitdir} diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index c8084b39e..c2f5b2cc5 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -11,6 +11,10 @@ EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" 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" + do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } |