From 9f2ba62e5604a59b88f1bdc8cdc86fb43e0243d5 Mon Sep 17 00:00:00 2001 From: "Lakshminarayana R. Kammath" Date: Wed, 3 Nov 2021 05:41:03 -0500 Subject: meta-ibm: Add enclosure_fault and enclosure_identify to the Association json Earlier enclosure_identify and enclosure_fault associations were missing in the inventory manager. With this checkin we are adding those associations. busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis xyz.openbmc_project.Association.Definitions Associations a(sss) 24 "fault_led_group" "fault_inventory_object" "/xyz/openbmc_project/led/groups/enclosure_fault" "identify_led_group" "identify_inventory_object" "/xyz/openbmc_project/led/groups/enclosure_identify" "chassis" "inventory" "/xyz/openbmc_project/inventory/system/chassis" .... After closely looking into all the LED's it was identified that enclosure_fault and enclosure_identify is missing in the association and this commit is to enable same Signed-off-by: Lakshminarayana R. Kammath Change-Id: I42728d994e9110c56c607aeea98623fe2613af92 --- .../p10bmc/ibm,everest_associations.json | 22 ++++++++++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 22 ++++++++++++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) (limited to 'meta-ibm') 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 7405ce1fc..68a0a6ac2 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 @@ -174,6 +174,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { 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 65f389998..b6f1ceaf3 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 @@ -255,6 +255,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { 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 5cda22d66..667c53c89 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 @@ -249,6 +249,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { -- cgit v1.2.3 From 39d68d4071b8e9b61210e8bbe65d68a9662d0f34 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Thu, 2 Dec 2021 19:16:20 +0300 Subject: Remove BBLAYERS_NON_REMOVABLE variable `BBLAYERS_NON_REMOVABLE` is obsolete and no longer required. As it said by Yocto documentation it can be used by `Hob` https://www.yoctoproject.org/docs/1.5.2/ref-manual/ref-manual.html#var-BBLAYERS_NON_REMOVABLE that already removed since Yocto-2.1 https://www.yoctoproject.org/tools-resources/projects/hob Change-Id: Ibc2d8268a9d837a81e9cf6b0131dba8d0a030a3f Signed-off-by: Alexander Filippov --- meta-amd/meta-ethanolx/conf/bblayers.conf.sample | 12 ------------ meta-ampere/meta-jade/conf/bblayers.conf.sample | 12 ------------ meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample | 11 ----------- meta-bytedance/meta-g220a/conf/bblayers.conf.sample | 12 ------------ .../meta-evb-ast2500/conf/bblayers.conf.sample | 15 --------------- .../meta-evb-ast2600/conf/bblayers.conf.sample | 12 ------------ .../meta-evb-npcm750/conf/bblayers.conf.sample | 14 -------------- meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample | 12 ------------ meta-facebook/meta-bletchley/conf/bblayers.conf.sample | 15 --------------- meta-facebook/meta-tiogapass/conf/bblayers.conf.sample | 14 -------------- meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample | 14 -------------- meta-fii/meta-kudo/conf/bblayers.conf.sample | 12 ------------ meta-hpe/meta-dl360poc/conf/bblayers.conf.sample | 13 ------------- meta-ibm/conf/bblayers.conf.sample | 13 ------------- meta-ibm/meta-palmetto/conf/bblayers.conf.sample | 12 ------------ meta-ibm/meta-romulus/conf/bblayers.conf.sample | 12 ------------ meta-ingrasys/meta-zaius/conf/bblayers.conf.sample | 13 ------------- meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample | 14 -------------- .../meta-transformers/conf/bblayers.conf.sample | 16 ---------------- meta-phosphor/conf/bblayers.conf.sample | 10 ---------- meta-quanta/meta-f0b/conf/bblayers.conf.sample | 12 ------------ meta-quanta/meta-gbs/conf/bblayers.conf.sample | 13 ------------- meta-quanta/meta-gsj/conf/bblayers.conf.sample | 13 ------------- .../meta-olympus-nuvoton/conf/bblayers.conf.sample | 13 ------------- meta-quanta/meta-q71l/conf/bblayers.conf.sample | 14 -------------- meta-yadro/meta-nicole/conf/bblayers.conf.sample | 13 ------------- 26 files changed, 336 deletions(-) (limited to 'meta-ibm') diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample index 2b8d624bc..be7eb7c0f 100644 --- a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample +++ b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-amd \ ##OEROOT##/meta-amd/meta-ethanolx \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-amd \ - ##OEROOT##/meta-amd/meta-ethanolx \ - " diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample index 6e0893eb3..6427c8b1b 100644 --- a/meta-ampere/meta-jade/conf/bblayers.conf.sample +++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-ampere \ ##OEROOT##/meta-ampere/meta-jade \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-ampere \ - ##OEROOT##/meta-ampere/meta-jade \ - " diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample index 2f2b5f377..409a775a8 100644 --- a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample +++ b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample @@ -16,14 +16,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-asrock \ ##OEROOT##/meta-asrock/meta-e3c246d4i \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-asrock \ - ##OEROOT##/meta-asrock/meta-e3c246d4i \ - " diff --git a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample index 370d6456f..81b0a95f8 100644 --- a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample +++ b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-bytedance \ ##OEROOT##/meta-bytedance/meta-g220a \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-bytedance \ - ##OEROOT##/meta-bytedance/meta-g220a \ - " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample index 83c22c5b6..477be07f1 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -20,18 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-evb/meta-evb-aspeed \ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-evb \ - ##OEROOT##/meta-evb/meta-evb-aspeed \ - ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ - " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample index de8ab1312..145dac4f2 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \ - " diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample index ee62cea41..96c16f311 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-evb/meta-evb-nuvoton \ ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-evb \ - ##OEROOT##/meta-evb/meta-evb-nuvoton \ - ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \ - " diff --git a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample index 6e838d799..6c7bb92a6 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-raspberrypi \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-raspberrypi \ - " diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample index 3b24ed861..84dcddfbb 100644 --- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample +++ b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample @@ -20,18 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-bletchley \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-security/meta-tpm \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-bletchley \ - " diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample index d8d02ae93..2d4f102a8 100644 --- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-tiogapass \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-tiogapass \ - " diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample index 18dc94472..25e19f17f 100644 --- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-yosemitev2 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-yosemitev2 \ - " diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/bblayers.conf.sample index f8958b950..e16dfb9fa 100644 --- a/meta-fii/meta-kudo/conf/bblayers.conf.sample +++ b/meta-fii/meta-kudo/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-google \ ##OEROOT##/meta-fii/meta-kudo \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-fii/meta-kudo \ - " diff --git a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample index ef28dc220..d75648063 100644 --- a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample +++ b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-hpe \ ##OEROOT##/meta-hpe/meta-dl360poc \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-hpe/meta-gxp \ - ##OEROOT##/meta-hpe \ - ##OEROOT##/meta-hpe/meta-dl360poc \ - " diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample index 11b3f5980..4f70015be 100644 --- a/meta-ibm/conf/bblayers.conf.sample +++ b/meta-ibm/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security/meta-tpm \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ - " diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index b5c268c64..750b4763c 100644 --- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm/meta-palmetto \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm/meta-palmetto \ - " diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/bblayers.conf.sample index 1bb30353e..bf1f4e986 100644 --- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm/meta-romulus \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm/meta-romulus \ - " diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample index 3ee615247..7a4e18983 100644 --- a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample +++ b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-ingrasys \ ##OEROOT##/meta-ingrasys/meta-zaius \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ingrasys \ - ##OEROOT##/meta-ingrasys/meta-zaius \ - " diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample index 9f5c27cd4..b3fc4469f 100644 --- a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-inspur \ ##OEROOT##/meta-inspur/meta-fp5280g2\ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-inspur \ - ##OEROOT##/meta-inspur/meta-fp5280g2 \ - " diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/bblayers.conf.sample index c779683e2..783c90e88 100755 --- a/meta-inventec/meta-transformers/conf/bblayers.conf.sample +++ b/meta-inventec/meta-transformers/conf/bblayers.conf.sample @@ -20,19 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-inventec \ ##OEROOT##/meta-inventec/meta-transformers \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-inventec \ - ##OEROOT##/meta-inventec/meta-transformers \ -" - diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index 4c0c52e8c..d10e530a4 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -15,13 +15,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - " diff --git a/meta-quanta/meta-f0b/conf/bblayers.conf.sample b/meta-quanta/meta-f0b/conf/bblayers.conf.sample index db7f86a0d..252c26bc3 100644 --- a/meta-quanta/meta-f0b/conf/bblayers.conf.sample +++ b/meta-quanta/meta-f0b/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-f0b \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-f0b \ - " diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/bblayers.conf.sample index 903833258..22757391f 100644 --- a/meta-quanta/meta-gbs/conf/bblayers.conf.sample +++ b/meta-quanta/meta-gbs/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-gbs \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-gbs \ - " diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/bblayers.conf.sample index 1c895ea00..2746d9af1 100644 --- a/meta-quanta/meta-gsj/conf/bblayers.conf.sample +++ b/meta-quanta/meta-gsj/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-gsj \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-gsj \ - " diff --git a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample index f7b4c2210..eb6cb8059 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample +++ b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-olympus-nuvoton \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-olympus-nuvoton \ - " diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample index 880ce33b1..b4411a4e0 100644 --- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample +++ b/meta-quanta/meta-q71l/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-q71l \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-q71l \ - " diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/bblayers.conf.sample index 776b1a90b..3ceae4949 100644 --- a/meta-yadro/meta-nicole/conf/bblayers.conf.sample +++ b/meta-yadro/meta-nicole/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-yadro \ ##OEROOT##/meta-yadro/meta-nicole \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-nicole \ - " -- cgit v1.2.3 From 4e5730ceac7c6f5e4f33bf92a420ecdb119f395e Mon Sep 17 00:00:00 2001 From: Ben Tyner Date: Tue, 30 Nov 2021 07:49:19 -0600 Subject: meta-ibm:(PIM) Add altitude sensor association Make altitude sensor visible via redfish, chassis, all-sensors. Signed-off-by: Ben Tyner Change-Id: I7e032e74ad8889e7e80e197dccc7b65a26482c0a --- .../phosphor-inventory-manager/p10bmc/ibm,everest_associations.json | 1 + .../phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json | 1 + .../phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json | 1 + 3 files changed, 3 insertions(+) (limited to 'meta-ibm') 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 68a0a6ac2..a1a87e534 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 @@ -204,6 +204,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", 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 b6f1ceaf3..73dda9edf 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 @@ -285,6 +285,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", 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 667c53c89..2e1682de1 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 @@ -279,6 +279,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", "/xyz/openbmc_project/sensors/fan_tach/fan2_0", -- cgit v1.2.3 From 7dd9ff465dc582a5d03b2ea62eee147faae39ffc Mon Sep 17 00:00:00 2001 From: "Lakshminarayana R. Kammath" Date: Tue, 7 Dec 2021 04:38:14 -0600 Subject: meta-ibm: Add partition SAI and platform SAI as fault indicator objects phosphor-led-manager already has platform and partition system attention indicator D-Bus objects implementing xyz.openbmc_project.Led.Group. but, was not added to association json which this commit is doing. Signed-off-by: Lakshminarayana R. Kammath Change-Id: I3803cbb2d07626e3af6474ea8e74d987f4a963b0 --- .../p10bmc/ibm,everest_associations.json | 18 ++++++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 18 ++++++++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) (limited to 'meta-ibm') 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 a1a87e534..8693e7d1d 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 @@ -278,6 +278,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": 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 73dda9edf..2ea36bc67 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 @@ -321,6 +321,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": 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 2e1682de1..6d9bc42f1 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 @@ -309,6 +309,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": -- cgit v1.2.3 From bd6ddaf49c6a885d0624fd27990b2a5de79c7e1b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 16:07:35 -0600 Subject: meta-ibm:witherspoon: remove obmc-ikvm package Witherspoon is running tight on space, and as our primary hardware CI machine, we need to keep it going. The GUI has already been pulled out so the KVM package doesn't make much sense anyway. Tested: - Reduced image size by ~200KB - Will rely on CI to regression test Signed-off-by: Andrew Geissler Change-Id: I3e55702da764e4e1ca1673e158c7acf4f74c9bda --- meta-ibm/conf/machine/witherspoon.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 42844c1cc..e71992219 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -32,3 +32,5 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ # Inhibit phosphor-fan-control-fan-config-mrw-native PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" + +IMAGE_FEATURES:remove = "obmc-ikvm" -- cgit v1.2.3 From ad8a30cba53f55c8d529150fdf02fdc20d15d8ab Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Sun, 12 Dec 2021 15:44:38 +0530 Subject: post-code-manager : Switch to meson build system & Bump Tested By: Was able to sucessfully build post-code-manager using meson & was able to see that the daemon is working as before on a BMC. Signed-off-by: Manojkiran Eda Change-Id: I4cf90fc8bf0a3350b944d5ef94fa131cb6f1c35f --- .../state/phosphor-post-code-manager_%.bbappend | 4 ++-- .../recipes-phosphor/state/phosphor-post-code-manager_git.bb | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-ibm') 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 bee5a5ffa..e9f35d42d 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_OEMESON:append:p10bmc = "-Dmax-boot-cycle-count=5" +EXTRA_OEMESON:append:witherspoon-tacoma = "-Dmax-boot-cycle-count=5" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 28c835aeb..9551f5c57 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "c4440ebefb36d4c2eebd3d0bdf0ce4671f04a158" +SRCREV = "84855abe9efea81f2ed8cf025892a7400edc9d74" S = "${WORKDIR}/git" @@ -13,14 +13,15 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit cmake pkgconfig systemd +inherit meson pkgconfig systemd def get_service(d): + service_list = "xyz.openbmc_project.State.Boot.PostCode.service xyz.openbmc_project.State.Boot.PostCode@.service " if(d.getVar('OBMC_HOST_INSTANCES') == '0'): - return "xyz.openbmc_project.State.Boot.PostCode.service" + return service_list else: - return " ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) + return service_list+" ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) SYSTEMD_SERVICE:${PN} = "${@get_service(d)}" @@ -28,7 +29,6 @@ DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ phosphor-logging \ + libcereal \ " -FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service" -FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service" -- cgit v1.2.3