From 49465582e16221caf74cbdea11c87600a02bf47b Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Wed, 26 May 2021 17:37:41 -0500 Subject: meta-fii/meta-kudo: Remove entity manager json file The Entity Manager JSON file is being checked into entity-manager configurations, so it can be removed from meta directory. Signed-off-by: Lancelot Kao Signed-off-by: Mohaimen Alsamarai Signed-off-by: Charles Boyer Change-Id: Ibea2fc4f79012a4c3b27d3e86409856e699b6bd7 --- .../configuration/entity-manager/kudo.json | 3569 -------------------- .../configuration/entity-manager_%.bbappend | 2 - 2 files changed, 3571 deletions(-) delete mode 100644 meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json deleted file mode 100644 index a2cb8750b..000000000 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json +++ /dev/null @@ -1,3569 +0,0 @@ -[ - { - "Exposes":[ - { - "Address":"$address", - "Bus":"$bus", - "Name":"BMC FRU", - "Type":"EEPROM" - }, - { - "Address":"0x59", - "Bus":14, - "Name":"BMC_MAX34440", - "EntityID" : "0x13", - "Labels":[ - "vout2", - "vout3", - "vout4", - "vout5", - "vout6" - ], - "vout2_Name":"DC_P2V5", - "vout3_Name":"DC_P1V2", - "vout4_Name":"DC_P3V3_PU", - "vout5_Name":"DC_3V3_STBY", - "vout6_Name":"DC_P1V175", - "vout2_Max":3.5, - "vout3_Max":2.5, - "vout4_Max":5.8, - "vout5_Max":5.8, - "vout6_Max":3, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":2.877 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":2.74 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":2.260 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":2.192 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.33 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.22 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.15 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":1.137 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":3.927 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":3.745 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":2.951 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":2.724 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":3.927 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":3.745 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":2.951 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":2.724 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":1.298 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":1.239 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":1.109 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":1.109 - } - ], - "Type":"MAX34440" - }, - { - "Name":"DC_P2V5", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":0 - }, - { - "Name":"DC_P1V2", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":1 - }, - { - "Name":"DC_P3V3_PU", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":2 - }, - { - "Name":"DC_3V3_STBY", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":3 - }, - { - "Name":"DC_P1V175", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":4 - } - ], - "Name":"Kudo_BMC", - "Probe":"xyz.openbmc_project.FruDevice({'BOARD_SERIAL_NUMBER': 'ACN*'})", - "Type":"Board", - "xyz.openbmc_project.Inventory.Decorator.Asset":{ - "Manufacturer":"$BOARD_MANUFACTURER", - "Model":"$BOARD_PRODUCT_NAME", - "PartNumber":"$BOARD_PART_NUMBER", - "SerialNumber":"$BOARD_SERIAL_NUMBER" - }, - "xyz.openbmc_project.Inventory.Decorator.FruDevice":{ - "Bus":"$bus", - "Address":"$address" - }, - "xyz.openbmc_project.Inventory.Decorator.Ipmi": { - "EntityId": "0x07", - "EntityInstance": 0 - } - }, - { - "Exposes":[ - { - "Address":"$address", - "Bus":"$bus", - "Name":"MB FRU", - "Type":"EEPROM" - }, - { - "Address":"0x48", - "Bus":42, - "Name":"Mobo_M2_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":70 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":60 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 1 - }, - { - "Address":"0x49", - "Bus":43, - "Name":"Mobo_BATT_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":70 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":60 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 2 - }, - { - "Address":"0x48", - "Bus":44, - "Name":"CPU0_NBM_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":80 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":70 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 3 - }, - { - "Address":"0x49", - "Bus":45, - "Name":"CPU1_NBM_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":80 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":70 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 4 - }, - { - "Address":"0x5c", - "Bus":20, - "Name":"Mobo_INLET1_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":46 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":42 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 5 - }, - { - "Address":"0x5c", - "Bus":21, - "Name":"Mobo_OUTLET1_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 6 - }, - { - "Address":"0x5c", - "Bus":22, - "Name":"Mobo_OUTLET2_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 7 - }, - { - "Address":"0x5c", - "Bus":23, - "Name":"Mobo_OUTLET3_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 8 - }, - { - "Address":"0x74", - "Bus":26, - "Name":"Mobo_STB_T", - "Labels":[ - "temp1" - ], - "temp1_Name":"Mobo_STB_T", - "temp1_Max":255, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":105 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - } - ], - "Type":"pmbus", - "EntityId": "0x03", - "EntityInstance": 9 - }, - { - "Address":"0x40", - "Bus":32, - "Name":"MB_ADM1266_0", - "Labels":[ - "vout1", - "vout2", - "vout3", - "vout4", - "vout5", - "vout6", - "vout7", - "vout8", - "vout9", - "vout10", - "vout11", - "vout12", - "vout13", - "vout14", - "vout15", - "vout16", - "vout17" - ], - "vout1_Name":"Mobo_12V_PSTB", - "vout2_Name":"Mobo_5V", - "vout3_Name":"Mobo_3V3", - "vout4_Name":"Mobo_3V3_STB", - "vout5_Name":"Mobo_48V", - "vout6_Name":"CPU0_13V5_NBM", - "vout7_Name":"CPU0_3V3_SOC", - "vout8_Name":"CPU0_1V2_DQ0123", - "vout9_Name":"CPU0_1V2_DQ4567", - "vout10_Name":"Mobo_8V5_PSTB", - "vout11_Name":"Mobo_5V_PSTB", - "vout12_Name":"CPU0_1V8_VDDH", - "vout13_Name":"CPU0_1V5_VDDH", - "vout14_Name":"Mobo_1V8_SATA", - "vout15_Name":"CPU0_1V8_SOC", - "vout16_Name":"CPU0_0V8_DC_SOC", - "vout17_Name":"Mobo_VBAT_RTC", - "vout1_Max":14.5, - "vout2_Max":8.5, - "vout3_Max":6, - "vout4_Max":6, - "vout5_Max":70, - "vout6_Max":19.5, - "vout7_Max":5, - "vout8_Max":3, - "vout9_Max":3, - "vout10_Max":11.5, - "vout11_Max":7.5, - "vout12_Max":4, - "vout13_Max":3, - "vout14_Max":4.5, - "vout15_Max":5, - "vout16_Max":3, - "vout17_Max":6, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":12.654 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":12.483 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":11.856 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":11.343 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":6.127 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":5.328 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":4.695 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":3.397 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":4.019 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":3.502 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":3.079 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":2.773 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":5.593 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":4.935 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":235 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":1.762 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":65.175 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":60.225 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":39.6 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":36.3 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":16.872 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":15.048 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":9.88 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":8.436 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout7", - "Severity":1, - "Value":4.018 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout7", - "Severity":0, - "Value":3.489 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout7", - "Severity":0, - "Value":3.097 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout7", - "Severity":1, - "Value":2.234 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout8", - "Severity":1, - "Value":1.829 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout8", - "Severity":0, - "Value":1.286 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout8", - "Severity":0, - "Value":1.121 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout8", - "Severity":1, - "Value":0.755 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout9", - "Severity":1, - "Value":1.805 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout9", - "Severity":0, - "Value":1.263 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout9", - "Severity":0, - "Value":1.145 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout9", - "Severity":1, - "Value":0.802 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout10", - "Severity":1, - "Value":9.02 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout10", - "Severity":0, - "Value":8.975 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout10", - "Severity":0, - "Value":7.983 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout10", - "Severity":1, - "Value":7.938 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout11", - "Severity":1, - "Value":5.321 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout11", - "Severity":0, - "Value":5.204 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout11", - "Severity":0, - "Value":4.792 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout11", - "Severity":1, - "Value":4.704 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout12", - "Severity":1, - "Value":2.198 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout12", - "Severity":0, - "Value":1.915 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout12", - "Severity":0, - "Value":1.680 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout12", - "Severity":1, - "Value":1.193 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout13", - "Severity":1, - "Value":1.829 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout13", - "Severity":0, - "Value":1.711 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout13", - "Severity":0, - "Value":1.404 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout13", - "Severity":1, - "Value":1.003 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout14", - "Severity":1, - "Value":2.112 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout14", - "Severity":0, - "Value":1.918 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout14", - "Severity":0, - "Value":1.672 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout14", - "Severity":1, - "Value":1.408 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout15", - "Severity":1, - "Value":2.195 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout15", - "Severity":0, - "Value":1.92 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout15", - "Severity":0, - "Value":1.666 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout15", - "Severity":1, - "Value":1.176 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout16", - "Severity":1, - "Value":1.215 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout16", - "Severity":0, - "Value":1.062 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout16", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout16", - "Severity":1, - "Value":0.578 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout17", - "Severity":1, - "Value":4.019 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout17", - "Severity":0, - "Value":3.713 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout17", - "Severity":0, - "Value":3.079 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout17", - "Severity":1, - "Value":2.280 - } - ], - "Type":"ADM1266" - }, - { - "Name":"Mobo_12V_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":5 - }, - { - "Name":"Mobo_5V", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":6 - }, - { - "Name":"Mobo_3V3", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":7 - }, - { - "Name":"Mobo_3V3_STB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":8 - }, - { - "Name":"Mobo_48V", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":9 - }, - { - "Name":"CPU0_13V5_NBM", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":10 - }, - { - "Name":"CPU0_3V3_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":11 - }, - { - "Name":"CPU0_1V2_DQ0123", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":12 - }, - { - "Name":"CPU0_1V2_DQ4567", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":13 - }, - { - "Name":"Mobo_8V5_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":14 - }, - { - "Name":"Mobo_5V_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":15 - }, - { - "Name":"CPU0_1V8_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":16 - }, - { - "Name":"CPU0_1V5_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":17 - }, - { - "Name":"Mobo_1V8_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":18 - }, - { - "Name":"CPU0_1V8_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":19 - }, - { - "Name":"CPU0_0V8_DC_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":20 - }, - { - "Name":"Mobo_VBAT_RTC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":21 - }, - { - "Address":"0x41", - "Bus":32, - "Name":"MB_ADM1266_1", - "Labels":[ - "vout2", - "vout3", - "vout4", - "vout5", - "vout6", - "vout7", - "vout8", - "vout9", - "vout10", - "vout11", - "vout12", - "vout13", - "vout14", - "vout15", - "vout16", - "vout17" - ], - "vout2_Name":"Mobo_5V_SATA", - "vout3_Name":"Mobo_1V_SATA", - "vout4_Name":"CPU0_0V85_DC_RCA", - "vout5_Name":"CPU0_1V8_PCP", - "vout6_Name":"CPU1_13V5_NBM", - "vout7_Name":"CPU1_3V3_SOC", - "vout8_Name":"CPU1_1V2_DQ0123", - "vout9_Name":"CPU1_1V2_DQ4567", - "vout10_Name":"CPU0_0V75_PCP", - "vout11_Name":"CPU1_0V75_PCP", - "vout12_Name":"CPU1_1V8_VDDH", - "vout13_Name":"CPU1_1V5_VDDH", - "vout14_Name":"CPU1_0V85_DC_RCA", - "vout15_Name":"CPU1_1V8_SOC", - "vout16_Name":"CPU1_0V8_DC_SOC", - "vout17_Name":"CPU1_1V8_PCP", - "vout2_Max":9, - "vout3_Max":4.5, - "vout4_Max":3, - "vout5_Max":4, - "vout6_Max":20, - "vout7_Max":5.5, - "vout8_Max":3.5, - "vout9_Max":3.5, - "vout10_Max":3, - "vout11_Max":3, - "vout12_Max":4, - "vout13_Max":3.4, - "vout14_Max":3, - "vout15_Max":4, - "vout16_Max":3.2, - "vout17_Max":4, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":6.178 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":5.648 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":4.059 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":3.389 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":3.08 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":2.816 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":0.49 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.44 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":2.006 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":1.77 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":0.354 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":0.177 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":2.355 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":18.33 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":16.77 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":9.36 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":7.8 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout7", - "Severity":1, - "Value":4.212 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout7", - "Severity":0, - "Value":3.888 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout7", - "Severity":0, - "Value":2.268 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout7", - "Severity":1, - "Value":2.16 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout8", - "Severity":1, - "Value":2.055 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout8", - "Severity":0, - "Value":1.644 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout8", - "Severity":0, - "Value":0.959 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout8", - "Severity":1, - "Value":0.685 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout9", - "Severity":1, - "Value":2.055 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout9", - "Severity":0, - "Value":1.644 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout9", - "Severity":0, - "Value":0.959 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout9", - "Severity":1, - "Value":0.685 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout10", - "Severity":1, - "Value":1.416 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout10", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout10", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout10", - "Severity":1, - "Value":0.531 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout11", - "Severity":1, - "Value":1.416 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout11", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout11", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout11", - "Severity":1, - "Value":0.531 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout12", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout12", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout12", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout12", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout13", - "Severity":1, - "Value":2.06 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout13", - "Severity":0, - "Value":1.79 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout13", - "Severity":0, - "Value":1.197 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout13", - "Severity":1, - "Value":0.931 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout14", - "Severity":1, - "Value":2.124 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout14", - "Severity":0, - "Value":1.888 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout14", - "Severity":0, - "Value":0.354 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout14", - "Severity":1, - "Value":0.165 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout15", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout15", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout15", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout15", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout16", - "Severity":1, - "Value":1.375 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout16", - "Severity":0, - "Value":1.125 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout16", - "Severity":0, - "Value":0.6 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout16", - "Severity":1, - "Value":0.5 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout17", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout17", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout17", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout17", - "Severity":1, - "Value":1.099 - } - ], - "Type":"ADM1266" - }, - { - "Name":"Mobo_5V_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":22 - }, - { - "Name":"Mobo_1V_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":23 - }, - { - "Name":"CPU0_0V85_DC_RCA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":24 - }, - { - "Name":"CPU0_1V8_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":25 - }, - { - "Name":"CPU1_13V5_NBM", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":26 - }, - { - "Name":"CPU1_3V3_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":27 - }, - { - "Name":"CPU1_1V2_DQ0123", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":28 - }, - { - "Name":"CPU1_1V2_DQ4567", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":29 - }, - { - "Name":"CPU0_0V75_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":30 - }, - { - "Name":"CPU1_0V75_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":31 - }, - { - "Name":"CPU1_1V8_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":32 - }, - { - "Name":"CPU1_1V5_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":33 - }, - { - "Name":"CPU1_0V85_DC_RCA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":34 - }, - { - "Name":"CPU1_1V8_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":35 - }, - { - "Name":"CPU1_0V8_DC_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":36 - }, - { - "Name":"CPU1_1V8_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":37 - }, - { - "Address":"0x4e", - "Bus":2, - "Name":"MB_smpro_CPU1", - "Labels":[ - "temp1", - "temp2", - "temp3", - "temp4", - "temp5", - "temp6", - "temp7", - "temp8", - "temp9", - "temp10", - "temp11", - "temp12", - "temp13", - "power1", - "power2", - "power3", - "power4", - "power5", - "vout0", - "vout1", - "vout2", - "vout3", - "vout4", - "iout1", - "iout2", - "iout3", - "iout4", - "iout5" - ], - "Type":"AC01_SMPRO", - "temp1_Name":"CPU1_SOC_T", - "temp2_Name":"CPU1_SOC_VRD_T", - "temp3_Name":"CPU1_DIMM_VRD_T", - "temp4_Name":"CPU1_CORE_VRD_T", - "temp5_Name":"CPU1_CH0DIMM_T", - "temp6_Name":"CPU1_CH1DIMM_T", - "temp7_Name":"CPU1_CH2DIMM_T", - "temp8_Name":"CPU1_CH3DIMM_T", - "temp9_Name":"CPU1_CH4DIMM_T", - "temp10_Name":"CPU1_CH5DIMM_T", - "temp11_Name":"CPU1_CH6DIMM_T", - "temp12_Name":"CPU1_CH7DIMM_T", - "temp13_Name":"CPU1_RCA_VR_T", - "power1_Name":"CPU1_CPU_PW", - "power2_Name":"CPU1_SOC_TDP_PW", - "power3_Name":"CPU1_DIMM_VR1_PW", - "power4_Name":"CPU1_DIMM_VR2_PW", - "power5_Name":"CPU1_RCA_VR_PW", - "vout0_Name":"CPU1_CPU_VCORE", - "vout1_Name":"CPU1_SOC_V", - "vout2_Name":"CPU1_DIMM_VR1_V", - "vout3_Name":"CPU1_DIMM_VR2_V", - "vout4_Name":"CPU1_RCA_VR_V", - "iout1_Name":"CPU1_CORE_VRD_CU", - "iout2_Name":"CPU1_SOC_VRD_CU", - "iout3_Name":"CPU1_DIMM_VR1_CU", - "iout4_Name":"CPU1_DIMM_VR2_CU", - "iout5_Name":"CPU1_RCA_VRD_CU", - "temp1_Max":255, - "temp2_Max":255, - "temp3_Max":255, - "temp4_Max":255, - "temp5_Max":255, - "temp6_Max":255, - "temp7_Max":255, - "temp8_Max":255, - "temp9_Max":255, - "temp10_Max":255, - "temp11_Max":255, - "temp12_Max":255, - "temp13_Max":255, - "power1_Max":255, - "power2_Max":255, - "power3_Max":40, - "power4_Max":40, - "power5_Max":255, - "vout0_Max":3.2, - "vout1_Max":3.3, - "vout2_Max":3, - "vout3_Max":3, - "vout4_Max":7, - "iout1_Max":40, - "iout2_Max":14, - "iout3_Max":20, - "iout4_Max":20, - "iout5_Max":18, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp2", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp2", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp3", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp3", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp4", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp4", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp6", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp6", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp7", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp7", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp8", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp8", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp9", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp9", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp10", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp10", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp11", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp11", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp12", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp12", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp13", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp13", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power1", - "Severity":1, - "Value":54 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"power1", - "Severity":0, - "Value":48 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power3", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power4", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout0", - "Severity":1, - "Value":1.375 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout0", - "Severity":1, - "Value":0.312 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout0", - "Severity":0, - "Value":1.375 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout0", - "Severity":0, - "Value":0.312 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":1.032 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":0.32 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":0.903 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":0.45 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":1.475 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":0.920 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":1.357 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":1.003 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.475 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.920 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.357 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.003 - } - ] - }, - { - "Name":"CPU1_SOC_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":12 - }, - { - "Name":"CPU1_SOC_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":13 - }, - { - "Name":"CPU1_DIMM_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":14 - }, - { - "Name":"CPU1_CORE_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":15 - }, - { - "Name":"CPU1_DIMMG_T", - "EntityId":"0x03", - "EntityInstance":16 - }, - { - "Name":"CPU1_CH0DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":17 - }, - { - "Name":"CPU1_CH1DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":18 - }, - { - "Name":"CPU1_CH2DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":19 - }, - { - "Name":"CPU1_CH3DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":20 - }, - { - "Name":"CPU1_CH4DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":22 - }, - { - "Name":"CPU1_CH5DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":23 - }, - { - "Name":"CPU1_CH6DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":24 - }, - { - "Name":"CPU1_CH7DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":25 - }, - { - "Name":"CPU1_CPU_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":38 - }, - { - "Name":"CPU1_DIMM_VR1_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":39 - }, - { - "Name":"CPU1_DIMM_VR2_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":40 - }, - { - "Name":"CPU1_MEM_PW", - "EntityId":"0x13", - "EntityInstance":41 - }, - { - "Name":"CPU1_RCA_VR_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":42 - }, - { - "Name":"CPU1_SOC_TDP_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":43 - }, - { - "Name":"CPU1_CPU_VCORE", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":44 - }, - { - "Name":"CPU1_SOC_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":45 - }, - { - "Name":"CPU1_DIMM_VR1_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":46 - }, - { - "Name":"CPU1_DIMM_VR2_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":47 - }, - { - "Name":"CPU1_DIMM_DDR_V", - "EntityId":"0x13", - "EntityInstance":48 - }, - { - "Name":"CPU1_RCA_VR_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":49 - }, - { - "Name":"CPU1_RCA_VR_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":26 - }, - { - "Name":"CPU1_CORE_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":50 - }, - { - "Name":"CPU1_SOC_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":51 - }, - { - "Name":"CPU1_DIMM_VR1_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":52 - }, - { - "Name":"CPU1_DIMM_VR2_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":53 - }, - { - "Name":"CPU1_RCA_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":54 - }, - { - "Address":"0x4f", - "Bus":2, - "Name":"MB_smpro_CPU0", - "Labels":[ - "temp1", - "temp2", - "temp3", - "temp4", - "temp5", - "temp6", - "temp7", - "temp8", - "temp9", - "temp10", - "temp11", - "temp12", - "temp13", - "power1", - "power2", - "power3", - "power4", - "power5", - "vout0", - "vout1", - "vout2", - "vout3", - "vout4", - "iout1", - "iout2", - "iout3", - "iout4", - "iout5" - ], - "Type":"AC01_SMPRO", - "temp1_Name":"CPU0_SOC_T", - "temp2_Name":"CPU0_SOC_VRD_T", - "temp3_Name":"CPU0_DIMM_VRD_T", - "temp4_Name":"CPU0_CORE_VRD_T", - "temp5_Name":"CPU0_CH0DIMM_T", - "temp6_Name":"CPU0_CH1DIMM_T", - "temp7_Name":"CPU0_CH2DIMM_T", - "temp8_Name":"CPU0_CH3DIMM_T", - "temp9_Name":"CPU0_CH4DIMM_T", - "temp10_Name":"CPU0_CH5DIMM_T", - "temp11_Name":"CPU0_CH6DIMM_T", - "temp12_Name":"CPU0_CH7DIMM_T", - "temp13_Name":"CPU0_RCA_VR_T", - "power1_Name":"CPU0_CPU_PW", - "power2_Name":"CPU0_SOC_TDP_PW", - "power3_Name":"CPU0_DIMM_VR1_PW", - "power4_Name":"CPU0_DIMM_VR2_PW", - "power5_Name":"CPU0_RCA_VR_PW", - "vout0_Name":"CPU0_CPU_VCORE", - "vout1_Name":"CPU0_SOC_V", - "vout2_Name":"CPU0_DIMM_VR1_V", - "vout3_Name":"CPU0_DIMM_VR2_V", - "vout4_Name":"CPU0_RCA_VR_V", - "iout1_Name":"CPU0_CORE_VRD_CU", - "iout2_Name":"CPU0_SOC_VRD_CU", - "iout3_Name":"CPU0_DIMM_VR1_CU", - "iout4_Name":"CPU0_DIMM_VR2_CU", - "iout5_Name":"CPU0_RCA_VRD_CU", - "temp1_Max":255, - "temp2_Max":255, - "temp3_Max":255, - "temp4_Max":255, - "temp5_Max":255, - "temp6_Max":255, - "temp7_Max":255, - "temp8_Max":255, - "temp9_Max":255, - "temp10_Max":255, - "temp11_Max":255, - "temp12_Max":255, - "temp13_Max":255, - "power1_Max":350, - "power2_Max":250, - "power3_Max":40, - "power4_Max":80, - "power5_Max":255, - "vout0_Max":3, - "vout1_Max":3.5, - "vout2_Max":3.5, - "vout3_Max":3.5, - "vout4_Max":5, - "iout1_Max":40, - "iout2_Max":14, - "iout3_Max":20, - "iout4_Max":20, - "iout5_Max":18, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp2", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp2", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp3", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp3", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp4", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp4", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp5", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp5", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp6", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp6", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp7", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp7", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp8", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp8", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp9", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp9", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp10", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp10", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp11", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp11", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp12", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp12", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp13", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp13", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power1", - "Severity":1, - "Value":54 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"power1", - "Severity":0, - "Value":49 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power3", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power4", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout0", - "Severity":1, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout0", - "Severity":1, - "Value":0.295 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout0", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout0", - "Severity":0, - "Value":0.295 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":1.16 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":0.34 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":1.0 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":0.342 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":0.959 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":1.50 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":1.06 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.959 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.507 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.06 - } - ] - }, - { - "Name":"CPU0_SOC_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":27 - }, - { - "Name":"CPU0_SOC_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":28 - }, - { - "Name":"CPU0_DIMM_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":29 - }, - { - "Name":"CPU0_CORE_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":30 - }, - { - "Name":"CPU0_DIMMG_T", - "EntityId":"0x03", - "EntityInstance":31 - }, - { - "Name":"CPU0_CH0DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":32 - }, - { - "Name":"CPU0_CH1DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":33 - }, - { - "Name":"CPU0_CH2DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":34 - }, - { - "Name":"CPU0_CH3DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":35 - }, - { - "Name":"CPU0_CH4DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":37 - }, - { - "Name":"CPU0_CH5DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":38 - }, - { - "Name":"CPU0_CH6DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":39 - }, - { - "Name":"CPU0_CH7DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":40 - }, - { - "Name":"CPU0_CPU_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":55 - }, - { - "Name":"CPU0_DIMM_VR1_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":56 - }, - { - "Name":"CPU0_DIMM_VR2_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":57 - }, - { - "Name":"CPU0_MEM_PW", - "EntityId":"0x13", - "EntityInstance":58 - }, - { - "Name":"CPU0_RCA_VR_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":59 - }, - { - "Name":"CPU0_SOC_TDP_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":60 - }, - { - "Name":"CPU0_CPU_VCORE", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":61 - }, - { - "Name":"CPU0_SOC_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":62 - }, - { - "Name":"CPU0_DIMM_VR1_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":63 - }, - { - "Name":"CPU0_DIMM_VR2_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":64 - }, - { - "Name":"CPU0_DIMM_DDR_V", - "EntityId":"0x13", - "EntityInstance":65 - }, - { - "Name":"CPU0_RCA_VR_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":66 - }, - { - "Name":"CPU0_RCA_VR_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":41 - }, - { - "Name":"CPU0_CORE_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":67 - }, - { - "Name":"CPU0_SOC_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":68 - }, - { - "Name":"CPU0_DIMM_VR1_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":69 - }, - { - "Name":"CPU0_DIMM_VR2_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":70 - }, - { - "Name":"CPU0_RCA_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":71 - }, - { - "Index" : 8, - "Name" : "CPU0_NBM_V", - "Type" : "ADC", - "MaxValue": 4.04, - "MinValue": 0, - "EntityId" : "0x13", - "EntityInstance" : 72 - }, - { - "Index" : 9, - "Name" : "CPU1_NBM_V", - "Type" : "ADC", - "MaxValue": 4.04, - "MinValue": 0, - "EntityId" : "0x13", - "EntityInstance" : 73 - }, - { - "Name" : "CPU0_NBM_T" - }, - { - "Name" : "CPU1_NBM_T" - }, - { - "AllowedFailures":1, - "Name":"FanRedundancy", - "Type":"FanRedundancy" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN0_SPEED", - "Pwm":0, - "PwmName":"REAR_FAN0_PWM", - "Tachs":[ - 0 - ] - }, - "Index":0, - "MaxReading":20000, - "Name":"REAR_FAN0_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":6, - "Mutable":true - }, - { - "EntityId":"0x1D", - "EntityInstance":0, - "Mutable":true, - "Name":"REAR_FAN0_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN1_SPEED", - "Pwm":1, - "PwmName":"REAR_FAN1_PWM", - "Tachs":[ - 0 - ] - }, - "Index":1, - "MaxReading":20000, - "Name":"REAR_FAN1_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":7 - }, - { - "EntityId":"0x1D", - "EntityInstance":1, - "Mutable":true, - "Name":"REAR_FAN1_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN2_SPEED", - "Pwm":2, - "PwmName":"REAR_FAN2_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":8, - "Mutable":true - }, - "Index":2, - "MaxReading":20000, - "Name":"REAR_FAN2_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":2 - }, - { - "EntityId":"0x1D", - "EntityInstance":2, - "Mutable":true, - "Name":"REAR_FAN2_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN3_SPEED", - "Pwm":3, - "PwmName":"REAR_FAN3_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":3, - "Mutable":true - }, - "Index":3, - "MaxReading":20000, - "Name":"REAR_FAN3_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":9 - }, - { - "EntityId":"0x1D", - "EntityInstance":3, - "Mutable":true, - "Name":"REAR_FAN3_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN4_SPEED", - "Pwm":4, - "PwmName":"REAR_FAN4_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":4, - "Mutable":true - }, - "Index":4, - "MaxReading":20000, - "Name":"REAR_FAN4_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":10 - }, - { - "EntityId":"0x1D", - "EntityInstance":4, - "Mutable":true, - "Name":"REAR_FAN4_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN5_SPEED", - "Pwm":5, - "PwmName":"REAR_FAN5_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":5, - "Mutable":true - }, - "Index":5, - "MaxReading":20000, - "Name":"REAR_FAN5_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":11 - }, - { - "EntityId":"0x1D", - "EntityInstance":5, - "Mutable":true, - "Name":"REAR_FAN5_PWM", - "Type":"I2CFan" - }, - { - "Name": "Fan1Zone", - "Type": "Pid.Zone", - "MinThermalOutput": 25, - "FailSafePercent": 100 - }, - { - "Name": "Fan2Zone", - "Type": "Pid.Zone", - "MinThermalOutput": 25, - "FailSafePercent": 100 - }, - { - "Name": "REAR_FAN012", - "Type": "Pid", - "Class": "fan", - "SetPoint": 65.0, - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "PCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "REAR_FAN0_SPEED", - "REAR_FAN1_SPEED", - "REAR_FAN2_SPEED" - ], - "Outputs": [ - "REAR_FAN0_PWM", - "REAR_FAN1_PWM", - "REAR_FAN2_PWM" - ], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "REAR_FAN345", - "Type": "Pid", - "Class": "fan", - "SetPoint": 65.0, - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "PCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "REAR_FAN4_SPEED", - "REAR_FAN5_SPEED", - "REAR_FAN3_SPEED" - ], - "Outputs": [ - "REAR_FAN4_PWM", - "REAR_FAN5_PWM", - "REAR_FAN3_PWM" - ], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_SOC_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 90.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -4.5, - "ICoefficient": -0.3, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_SOC_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU0_VRD_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_SOC_VRD_T", - "CPU0_DIMM_VRD_T", - "CPU0_CORE_VRD_T", - "CPU0_RCA_VR_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU0_DIMMG_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_DIMMG_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_SOC_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 90.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -4.5, - "ICoefficient": -0.3, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_SOC_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU1_VRD_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_SOC_VRD_T", - "CPU1_DIMM_VRD_T", - "CPU1_CORE_VRD_T", - "CPU1_RCA_VR_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU1_DIMMG_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_DIMMG_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "Mobo_STB_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_STB_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_NBM_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 75.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_NBM_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_NBM_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 75.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_NBM_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_NBM_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_NBM_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_NBM_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_NBM_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "Mobo_M2_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 50.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_M2_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "Mobo_BATT_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 50.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -3.5, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_BATT_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - } - ], - "Name":"Kudo_MB", - "Probe":"xyz.openbmc_project.FruDevice({'BOARD_SERIAL_NUMBER': 'MCN*'})", - "Type":"Board", - "xyz.openbmc_project.Inventory.Decorator.Asset":{ - "Manufacturer":"$BOARD_MANUFACTURER", - "Model":"$BOARD_PRODUCT_NAME", - "PartNumber":"$BOARD_PART_NUMBER", - "SerialNumber":"$BOARD_SERIAL_NUMBER" - }, - "xyz.openbmc_project.Inventory.Decorator.FruDevice":{ - "Bus":"$bus", - "Address":"$address" - }, - "xyz.openbmc_project.Inventory.Decorator.Ipmi": { - "EntityId": "0x07", - "EntityInstance": 1 - } - } -] diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend index 7daa029eb..02b9d7c60 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,11 +1,9 @@ FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" SRC_URI_append_kudo = " \ - file://kudo.json \ file://blacklist.json \ " do_install_append_kudo () { - install -m 0644 -D ${WORKDIR}/kudo.json ${D}${datadir}/${PN}/configurations/kudo.json install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json } -- cgit v1.2.3 From c71cc43c0d3a23b2621ce68fb2eb364c0b0261a4 Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Tue, 25 May 2021 14:27:14 -0500 Subject: meta-fii/meta-kudo: Enable SEL and Redfish logs Enable the Redfish logs and SEL threshold, pulse, and watchdog event monitoring. Signed-off-by: Lancelot Kao Signed-off-by: Mohaimen Alsamarai Signed-off-by: Charles Boyer Change-Id: I8b72923693a8a3a426f2b87185a89aa1add8781c --- meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend | 5 +++++ .../recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend new file mode 100644 index 000000000..af0bc3bd6 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -0,0 +1,5 @@ +EXTRA_OEMESON_append_kudo = " \ + -Dredfish-dump-log=enabled \ + -Dredfish-bmc-journal=enabled \ + -Dredfish-allow-deprecated-hostname-patch=enabled \ +" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 3fffde0d4..133159cb4 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1,2 @@ -PACKAGECONFIG_append_kudo = " log-threshold" +# Enable threshold, pulse, and watchdog monitoring +PACKAGECONFIG_append_kudo = " log-threshold log-pulse log-watchdog" -- cgit v1.2.3 From 9359cfff00485b1e028fb7fd532acc1f44886aca Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Mon, 24 May 2021 15:09:42 -0500 Subject: meta-kudo: update kernel configure for 5.10 update the kernel configure file for 5.10 kernel Signed-off-by: Lancelot Kao Change-Id: I423ed5a6fa78c43d356d3098e3eb518da1f7476f Signed-off-by: Mohaimen Alsamarai --- meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg index ff6022724..7fb979261 100644 --- a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg @@ -1,13 +1,14 @@ CONFIG_HWMON=y CONFIG_SENSORS_TMP100=y CONFIG_SENSORS_LM75=y -CONFIG_SENSORS_FAN=y +CONFIG_SENSORS_PWM_FAN=y CONFIG_SENSORS_ADC128D818=y CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_TMP102=y CONFIG_SENSORS_TMP421=y CONFIG_SENSORS_MAX31790=y CONFIG_SENSORS_MAX34440=y +CONFIG_SENSORS_ADM1266=y CONFIG_PMBUS=y CONFIG_SENSORS_PMBUS=y -- cgit v1.2.3 From 23ca3ffa9de533fecc0fcd48fea85e365c323370 Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Mon, 24 May 2021 15:51:39 -0500 Subject: meta-fii/meta-kudo: Adding distro config for kudo add BMC version in distro/openbmc-kudo.conf add Gbmc.conf add dev_id.json Signed-off-by: Lancelot Kao Change-Id: I84c6d735cfad55abaa272edab1d10b4b9d4b0d99 --- meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf | 5 +++++ meta-fii/meta-kudo/conf/local.conf.sample | 2 +- .../meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 1 + .../meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf create mode 100644 meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend create mode 100644 meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf new file mode 100644 index 000000000..50e6ab35a --- /dev/null +++ b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf @@ -0,0 +1,5 @@ +require conf/distro/openbmc-phosphor.conf +require conf/distro/gbmc.conf + +DISTRO = "openbmc-kudo" +VERSION_ID_kudo = "v0.d-00-kudo" diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index 8d07a5b5b..2bd1c0930 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "kudo" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-kudo" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..2ca746078 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json new file mode 100644 index 000000000..6b543b9ec --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json @@ -0,0 +1,2 @@ +{"id": 0, "revision": 1, "addn_dev_support": 133, + "manuf_id": 17084, "prod_id": 1, "aux": 0} -- cgit v1.2.3 From f59d01784b9646026df272cbb05ebe8c4fb3cd63 Mon Sep 17 00:00:00 2001 From: Mohaimen Alsamarai Date: Tue, 17 Aug 2021 09:34:22 -0500 Subject: meta-fii/meta-kudo: follow the new Yocto override syntax change Changing the syntax for various yocto files ie. (_ to :) changes to bb, bbappend and conf files. Signed-off-by: Mohaimen Alsamarai Change-Id: If25577ee9d98398c1a1ab7f85a0373c46af70245 --- meta-fii/conf/layer.conf | 2 +- meta-fii/meta-kudo/conf/layer.conf | 2 +- meta-fii/meta-kudo/conf/local.conf.sample | 4 ++-- meta-fii/meta-kudo/conf/machine/kudo.conf | 10 ++++----- .../u-boot/u-boot-fw-utils-nuvoton_%.bbappend | 6 +++--- .../recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend | 4 ++-- .../recipes-extended/rsyslog/rsyslog_%.bbappend | 12 +++++------ .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 4 ++-- .../meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 4 ++-- .../hotswap-power-cycle/hotswap-power-cycle.bb | 8 ++++---- .../recipes-kudo/ipmi/fii-ipmi-oem_git.bb | 8 ++++---- .../kudo-fw-utility/kudo-bios-update.bb | 10 ++++----- .../kudo-fw-utility/kudo-bmc-update.bb | 6 +++--- .../kudo-fw-utility/kudo-cpld-update.bb | 14 ++++++------- .../recipes-kudo/kudo-fw-utility/kudo-fw.bb | 6 +++--- .../kudo-fw-utility/kudo-scp-update.bb | 12 +++++------ .../recipes-kudo/kudo-sys-utility/kudo-boot.bb | 6 +++--- .../recipes-kudo/kudo-sys-utility/kudo-cmd.bb | 2 +- .../kudo-system/kudo-entity-association-map.bb | 2 +- .../meta-kudo/recipes-kudo/network/usb-network.bb | 10 ++++----- .../packagegroups/packagegroup-kudo-apps.bb | 22 ++++++++++---------- .../configuration/entity-manager_%.bbappend | 6 +++--- .../console/obmc-console_%.bbappend | 20 +++++++++--------- .../fans/phosphor-pid-control_%.bbappend | 6 +++--- .../meta-kudo/recipes-phosphor/fans/pwm-init.bb | 10 ++++----- .../image/obmc-phosphor-image.bbappend | 24 +++++++++++----------- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 3 +-- .../phosphor-ipmi-blobs-binarystore_%.bbappend | 8 ++++---- .../ipmi/phosphor-ipmi-flash_%.bbappend | 4 ++-- .../ipmi/phosphor-ipmi-host_%.bbappend | 4 ++-- .../sel-logger/phosphor-sel-logger_%.bbappend | 2 +- .../sensors/phosphor-virtual-sensor_%.bbappend | 12 +++++------ .../settings/phosphor-settings-manager_%.bbappend | 4 ++-- .../skeleton/obmc-libobmc-intf_%.bbappend | 4 ++-- .../watchdog/phosphor-watchdog_%.bbappend | 6 +++--- 35 files changed, 133 insertions(+), 134 deletions(-) (limited to 'meta-fii') diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf index 4cb55ee26..ea180d473 100644 --- a/meta-fii/conf/layer.conf +++ b/meta-fii/conf/layer.conf @@ -5,4 +5,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "fii-layer" BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fii-layer = "warrior zeus gatesgarth dunfell hardknott" +LAYERSERIES_COMPAT_fii-layer = "hardknott honister" diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf index 84c091cea..d2b0e57e2 100644 --- a/meta-fii/meta-kudo/conf/layer.conf +++ b/meta-fii/meta-kudo/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "kudo-layer" BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_kudo-layer = "warrior zeus gatesgarth dunfell hardknott" +LAYERSERIES_COMPAT_kudo-layer = "hardknott honister" diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index 2bd1c0930..ed6eb492b 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -1,7 +1,7 @@ MACHINE ??= "kudo" DISTRO ?= "openbmc-kudo" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" @@ -14,5 +14,5 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 768719d8b..792e63c24 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -5,10 +5,10 @@ require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc FLASH_SIZE = "65536" -FLASH_UBOOT_OFFSET_flash-65536 = "0" -FLASH_KERNEL_OFFSET_flash-65536 = "2048" -FLASH_ROFS_OFFSET_flash-65536 = "7168" -FLASH_RWFS_OFFSET_flash-65536 = "62400" +FLASH_UBOOT_OFFSET:flash-65536 = "0" +FLASH_KERNEL_OFFSET:flash-65536 = "2048" +FLASH_ROFS_OFFSET:flash-65536 = "7168" +FLASH_RWFS_OFFSET:flash-65536 = "62400" UBOOT_MACHINE = "PolegSVB_config" UBOOT_DEVICETREE = "nuvoton-npcm730-kudo" @@ -34,4 +34,4 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-health-monitor" diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend index 5c56e17a0..7f1ede941 100644 --- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://fw_env.config" +SRC_URI:append:kudo = " file://fw_env.config" -do_install_append_kudo () { +do_install:append:kudo () { install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend index 1c1383680..3c0bd73a7 100644 --- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://kudo.cfg" +SRC_URI:append:kudo = " file://kudo.cfg" diff --git a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend index 278debb32..46862b9d0 100644 --- a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://rsyslog.conf \ file://rsyslog.logrotate \ file://rotate-event-logs.service \ @@ -8,11 +8,11 @@ SRC_URI_append_kudo = " \ file://rsyslog-override.conf \ " -FILES_${PN}_append_kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" +FILES:${PN}:append:kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" -PACKAGECONFIG_append_kudo = " imjournal" +PACKAGECONFIG:append:kudo = " imjournal" -do_install_append_kudo() { +do_install:append:kudo() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}/rsyslog.service.d install -m 0644 ${WORKDIR}/rsyslog-override.conf \ @@ -22,4 +22,4 @@ do_install_append_kudo() { rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN}_append_kudo = " rotate-event-logs.service" +SYSTEMD_SERVICE:${PN}:append:kudo = " rotate-event-logs.service" diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend index 5276bef59..611af3240 100644 --- a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/linux-nuvoton:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/linux-nuvoton:" -SRC_URI_append_kudo = " file://kudo.cfg" +SRC_URI:append:kudo = " file://kudo.cfg" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index affbcf727..461aeb5d4 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -20,10 +20,10 @@ SRC_URI = "file://ampere-host-shutdown.service \ " DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ampere-host-shutdown.service \ ampere-host-reset.service \ ampere-chassis-poweroff.service \ diff --git a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb index d01b898a9..12098adfa 100644 --- a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb +++ b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append_kudo = " file://hotswap-power-cycle.service" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append:kudo = " file://hotswap-power-cycle.service" do_install() { install -d ${D}${systemd_unitdir}/system/ @@ -18,4 +18,4 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " hotswap-power-cycle.service" +SYSTEMD_SERVICE:${PN} = " hotswap-power-cycle.service" diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb index c0793adf6..b56ce441e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb +++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb @@ -20,7 +20,7 @@ SRCREV = "35c1ac40e476caa19c84a546d4f85ba96cb5dbbd" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb index b126bfc8c..9fb7d243c 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb @@ -10,18 +10,18 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-bios-update.service \ file://config-bios.json \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-bios-update.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb index 184f3efc6..71daad346 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb @@ -6,11 +6,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://config-bmc.json \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb index b2fd8209d..d32b280ea 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb @@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-bmccpld-update.service \ file://phosphor-ipmi-flash-mbcpld-update.service \ file://config-bmccpld.json \ @@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-bmccpld-update.service \ phosphor-ipmi-flash-mbcpld-update.service \ " @@ -36,4 +36,4 @@ do_install () { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-bmccpld-update.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-mbcpld-update.service ${D}${systemd_system_unitdir} -} \ No newline at end of file +} diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb index 03ce088fc..28d276f96 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb @@ -10,8 +10,8 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI = " \ @@ -22,7 +22,7 @@ SRC_URI = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ kudo-fw-ver.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb index 2c82ac8f6..70c40e631 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb @@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-scp-update.service \ file://phosphor-ipmi-flash-scpback-update.service \ file://config-scp.json \ @@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-scp-update.service \ phosphor-ipmi-flash-scpback-update.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb index 87e4f747b..c800f266e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb @@ -9,8 +9,8 @@ inherit systemd inherit obmc-phosphor-systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI = " \ file://init_once.sh \ @@ -18,7 +18,7 @@ SRC_URI = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ host-powerctrl.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb index f4e0bb09f..324bd640c 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb @@ -5,7 +5,7 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " \ file://kudo.sh \ diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb index 85006dadc..0b0ac37c6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 SRC_URI += "file://kudo_entity_association_map.json" -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/ipmi-entity-association/entity_association_map.json \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb index 249e454ae..6e7be67c2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb +++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb @@ -4,18 +4,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -SRC_URI_append += " \ +SRC_URI:append += " \ file://usb_network.sh \ file://usb_network.service \ file://00-bmc-usb0.network \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append = " usb_network.service" -FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" +SYSTEMD_SERVICE:${PN}:append = " usb_network.service" +FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" do_install() { install -d ${D}/${sbindir} diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index cc32052c5..a46e3a0b8 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -14,20 +14,20 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" -RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" -RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" -SUMMARY_${PN}-kudo-chassis = "kudo chassis" -RDEPENDS_${PN}-kudo-chassis = " \ +SUMMARY:${PN}-kudo-chassis = "kudo chassis" +RDEPENDS:${PN}-kudo-chassis = " \ phosphor-hostlogger \ obmc-op-control-power \ obmc-phosphor-buttons-signals \ obmc-phosphor-buttons-handler \ " -SUMMARY_${PN}-kudo-system = "kudo System" -RDEPENDS_${PN}-kudo-system = " \ +SUMMARY:${PN}-kudo-system = "kudo System" +RDEPENDS:${PN}-kudo-system = " \ ipmitool \ ethtool \ memtester \ @@ -44,8 +44,8 @@ RDEPENDS_${PN}-kudo-system = " \ phosphor-state-manager \ " -SUMMARY_${PN}-kudo-fw = "kudo Firmware" -RDEPENDS_${PN}-kudo-fw = " \ +SUMMARY:${PN}-kudo-fw = "kudo Firmware" +RDEPENDS:${PN}-kudo-fw = " \ kudo-fw \ kudo-bios-update \ kudo-bmc-update \ @@ -53,8 +53,8 @@ RDEPENDS_${PN}-kudo-fw = " \ kudo-scp-update \ " -SUMMARY_${PN}-fan-mgmt = "kudo fan mgmt" -RDEPENDS_${PN}-fan-mgmt = " \ +SUMMARY:${PN}-fan-mgmt = "kudo fan mgmt" +RDEPENDS:${PN}-fan-mgmt = " \ pwm-init \ phosphor-pid-control \ " diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend index 02b9d7c60..ae0d3f5ca 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://blacklist.json \ " -do_install_append_kudo () { +do_install:append:kudo () { install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend index 9daae7c86..b08aab399 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -RDEPENDS_${PN}_append_kudo = " bash" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +RDEPENDS:${PN}:append:kudo = " bash" # Remove what installed by common recipe OBMC_CONSOLE_HOST_TTY = "" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" # Declare port spcific conf and service files HOST_CONSOLE_TTY = "ttyS1 ttyS3" CONSOLE_CONF_FMT = "file://server.{0}.conf" -SRC_URI_append_kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" -SRC_URI_append_kudo = " file://${BPN}@.service" -SRC_URI_append_kudo = " file://kudo_uart_mux_ctrl.sh" +SRC_URI:append:kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" +SRC_URI:append:kudo = " file://${BPN}@.service" +SRC_URI:append:kudo = " file://kudo_uart_mux_ctrl.sh" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ ${PN}@.service \ " -do_install_append() { +do_install:append() { for i in ${HOST_CONSOLE_TTY} do install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf @@ -35,7 +35,7 @@ do_install_append() { } -pkg_postinst_${PN}_append () { +pkg_postinst:${PN}:append () { systemctl --root=$D enable obmc-console@ttyS1.service systemctl --root=$D enable obmc-console@ttyS3.service } diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 03f391cc1..59b0db26e 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://phosphor-pid-control.service" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://phosphor-pid-control.service" inherit systemd -SYSTEMD_SERVICE_${PN}_append_kudo = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:kudo = " phosphor-pid-control.service" diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb index c380feba3..f4b04e60b 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb @@ -6,10 +6,10 @@ PR = "r1" inherit systemd DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" S = "${WORKDIR}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://pwm_init.service \ file://bin/pwm_init.sh \ @@ -17,11 +17,11 @@ SRC_URI += " \ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} += "pwm_init.service" +SYSTEMD_SERVICE:${PN} += "pwm_init.service" -FILES_${PN} += "${bindir}/* ${systemd_system_unitdir}/*" +FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*" -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${S}/bin/* ${D}${bindir}/ install -d ${D}${systemd_system_unitdir} diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend index 87dc22827..682932a1c 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -1,12 +1,12 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs-binarystore" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-ethstats" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-flash" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-net" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-host" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-host-postd" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-logging" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-sel-logger" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " entity-manager" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " dbus-sensors" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-virtual-sensor" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs-binarystore" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-ethstats" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-flash" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-net" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-host" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-logging" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-sel-logger" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " entity-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " dbus-sensors" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-virtual-sensor" diff --git a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend index af0bc3bd6..4dd9dc131 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,4 @@ -EXTRA_OEMESON_append_kudo = " \ +EXTRA_OEMESON:append:kudo = " \ -Dredfish-dump-log=enabled \ -Dredfish-bmc-journal=enabled \ - -Dredfish-allow-deprecated-hostname-patch=enabled \ " diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend index f87ac040f..a1ed74666 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://config.json" -FILES_${PN}_append_kudo = " ${datadir}/binaryblob/config.json" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://config.json" +FILES:${PN}:append:kudo = " ${datadir}/binaryblob/config.json" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/binaryblob/ install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index fa9468ac4..e00d74db7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1,3 +1,3 @@ -PACKAGECONFIG_append_kudo = " nuvoton-p2a-mbox net-bridge" +PACKAGECONFIG:append:kudo = " nuvoton-p2a-mbox net-bridge" -IPMI_FLASH_BMC_ADDRESS_kudo = "0xF0848000" +IPMI_FLASH_BMC_ADDRESS:kudo = "0xF0848000" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 5e0eddc71..da7f376e3 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" #Add sensorhandler.hpp and selutilty.hpp since intel-ipmi-oem requires these libs -do_install_append_kudo(){ +do_install:append:kudo(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 133159cb4..844a25b8f 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,2 @@ # Enable threshold, pulse, and watchdog monitoring -PACKAGECONFIG_append_kudo = " log-threshold log-pulse log-watchdog" +PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 43f5f5660..f89f5d9a7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" inherit systemd -RDEPENDS_${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_kudo = " tla2024-enable.service" +RDEPENDS:${PN} += "bash" +SYSTEMD_SERVICE:${PN}:append:kudo = " tla2024-enable.service" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://virtual_sensor_config.json \ file://tla2024-enable.service \ file://tla2024-enable.sh \ " -FILES_${PN}_append_kudo = " ${bindir}/tla2024-enable.sh" +FILES:${PN}:append:kudo = " ${bindir}/tla2024-enable.sh" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/${PN} install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/${PN}/virtual_sensor_config.json install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${bindir}/tla2024-enable.sh diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 79d7ac0b0..1f559ef91 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://chassis_capabilities.override.yml" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://chassis_capabilities.override.yml" diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 533a69a91..889b91091 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://gpio_defs.json" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://gpio_defs.json" diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index e795905ab..787ddabc6 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}_remove_kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_SERVICE_${PN}_kudo = " phosphor-watchdog.service \ +SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ phosphor-watchdog-host-reset.service\ -- cgit v1.2.3 From 341941432b62848717dfe81d522cb0acd7cac2ff Mon Sep 17 00:00:00 2001 From: Mohaimen Alsamarai Date: Thu, 19 Aug 2021 13:19:55 -0500 Subject: meta-fii/meta-kudo: Add kudo-chassis to packagegroup Adding chassis management packages Signed-off-by: Mohaimen Alsamarai Change-Id: I334f925414815961fd9e6dcb309a52c14d670f03 --- meta-fii/meta-kudo/conf/machine/kudo.conf | 2 ++ .../meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 792e63c24..bcdbdfd2d 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -26,6 +26,7 @@ OBMC_MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-chassis-mgmt \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" @@ -33,5 +34,6 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps" # Remove unneeded binaries from image IMAGE_FEATURES:remove = "obmc-health-monitor" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index a46e3a0b8..d2e3ebd26 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -11,9 +11,11 @@ PACKAGES = " \ ${PN}-fan-mgmt \ " +PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" +RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" @@ -22,8 +24,6 @@ SUMMARY:${PN}-kudo-chassis = "kudo chassis" RDEPENDS:${PN}-kudo-chassis = " \ phosphor-hostlogger \ obmc-op-control-power \ - obmc-phosphor-buttons-signals \ - obmc-phosphor-buttons-handler \ " SUMMARY:${PN}-kudo-system = "kudo System" -- cgit v1.2.3 From 28443cbe6f0ff3417ed16505a7aed25090731ba0 Mon Sep 17 00:00:00 2001 From: Mohaimen Alsamarai Date: Fri, 18 Jun 2021 14:17:58 -0500 Subject: meta-fii/meta-kudo: Fix virtual sensor config Fix virtual sensor config so that sensors will show NA in the SDR when missing its input sensors. Signed-off-by: Mohaimen Alsamarai Change-Id: I9bba40046c58455e4ba4d8dcd963871023f6920c --- .../virtual_sensor_config.json | 141 +++++++++++++++++---- 1 file changed, 119 insertions(+), 22 deletions(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index c353e8216..5ee9143fb 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -14,6 +14,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -22,13 +35,13 @@ "ParamName": "V1", "Desc": { - "Name": "CPU0_NBM_V", + "Name": "CPU0_NBM_TEMP_V", "SensorType": "voltage" } } ] }, - "Expression": "(V1 - 2.73) * 100" + "Expression": "(V1 == V1) ? (V1 - 2.73) * 100 : NULL" }, { "Desc": @@ -45,6 +58,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -53,13 +79,13 @@ "ParamName": "V2", "Desc": { - "Name": "CPU1_NBM_V", + "Name": "CPU1_NBM_TEMP_V", "SensorType": "voltage" } } ] }, - "Expression": "(V2 - 2.73) * 100" + "Expression": "(V2 == V2) ? (V2 - 2.73) * 100 : NULL" }, { "Desc": @@ -76,6 +102,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -146,7 +185,7 @@ } ] }, - "Expression": "max((CH0 == CH0) ? CH0 : 0,(CH1 == CH1) ? CH1 : 0,(CH2 == CH2) ? CH2 : 0,(CH3 == CH3) ? CH3 : 0,(CH4 == CH4) ? CH4 : 0,(CH5 == CH5) ? CH5 : 0,(CH6 == CH6) ? CH6 : 0,(CH7 == CH7) ? CH7 : 0)" + "Expression": "max((CH0 == CH0) ? CH0 : NULL,(CH1 == CH1) ? CH1 : NULL,(CH2 == CH2) ? CH2 : NULL,(CH3 == CH3) ? CH3 : NULL,(CH4 == CH4) ? CH4 : NULL,(CH5 == CH5) ? CH5 : NULL,(CH6 == CH6) ? CH6 : NULL,(CH7 == CH7) ? CH7 : NULL)" }, { "Desc": @@ -163,6 +202,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -233,7 +285,7 @@ } ] }, - "Expression": "max((CH0 == CH0) ? CH0 : 0,(CH1 == CH1) ? CH1 : 0,(CH2 == CH2) ? CH2 : 0,(CH3 == CH3) ? CH3 : 0,(CH4 == CH4) ? CH4 : 0,(CH5 == CH5) ? CH5 : 0,(CH6 == CH6) ? CH6 : 0,(CH7 == CH7) ? CH7 : 0)" + "Expression": "max((CH0 == CH0) ? CH0 : NULL,(CH1 == CH1) ? CH1 : NULL,(CH2 == CH2) ? CH2 : NULL,(CH3 == CH3) ? CH3 : NULL,(CH4 == CH4) ? CH4 : NULL,(CH5 == CH5) ? CH5 : NULL,(CH6 == CH6) ? CH6 : NULL,(CH7 == CH7) ? CH7 : NULL)" }, { "Desc": @@ -246,10 +298,21 @@ "Threshold" : { "CriticalHigh": 2.999, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -272,7 +335,7 @@ } ] }, - "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : -1" + "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : NULL" }, { "Desc": @@ -285,10 +348,21 @@ "Threshold" : { "CriticalHigh": 2.999, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -311,7 +385,7 @@ } ] }, - "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : -1" + "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : NULL" }, { "Desc": @@ -324,10 +398,21 @@ "Threshold" : { "CriticalHigh": 29.987, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -350,7 +435,7 @@ } ] }, - "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : -1" + "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : NULL" }, { "Desc": @@ -363,10 +448,21 @@ "Threshold" : { "CriticalHigh": 29.987, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -389,6 +485,7 @@ } ] }, - "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : -1" + "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : NULL" } ] + -- cgit v1.2.3 From 7204de528f32b4ef23d33c1318e656293997c311 Mon Sep 17 00:00:00 2001 From: Mohaimen Alsamarai Date: Fri, 20 Aug 2021 16:31:59 -0500 Subject: meta-fii/meta-kudo: Fix missing override change Signed-off-by: Mohaimen Alsamarai Change-Id: I83358748c2a8102c018d3e6ffb7f1fabad459c00 --- meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 2ca746078..a7f4b8c35 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -- cgit v1.2.3 From 0ad4530d13f6af21acf3b9e241a32b76fdd8743c Mon Sep 17 00:00:00 2001 From: Mustafa Shehabi Date: Mon, 23 Aug 2021 15:27:13 -0500 Subject: meta-fii/meta-kudo: Add I2C bus 12 to blacklist Add I2C bus 12 to blacklist file in the EM configuration 12 is slave and Fru device should not be scanning it. Signed-off-by: Mustafa Shehabi Change-Id: I51c66f7b322113d2b4120a266b053ea3e92cc0fa --- .../recipes-phosphor/configuration/entity-manager/blacklist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json index b304fe1d9..cba3d0108 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json @@ -1,3 +1,3 @@ { - "buses": [1] + "buses": [1, 12] } -- cgit v1.2.3 From e433dcd6ee1fe99fd9c60fa1f9b9b972b5904cca Mon Sep 17 00:00:00 2001 From: XP Chen Date: Wed, 25 Aug 2021 17:13:12 -0500 Subject: meta-fii/meta-kudo: Add ethtool to phosphor-network Enable redfish response to contain EthernetInterface SpeedMbps /redfish/v1/Managers/bmc/EthernetInterfaces/eth[x] Signed-off-by: XP Chen Change-Id: I0d4179935b37c8d7bd5d0c51b122851d4f81a99d --- meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..6618bf117 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:kudo = " nic-ethtool" -- cgit v1.2.3 From 4010b172c9086c4c5ef9261321de6213ac2d8871 Mon Sep 17 00:00:00 2001 From: Mustafa Shehabi Date: Thu, 26 Aug 2021 11:22:46 -0500 Subject: meta-fii/meta-kudo: Modify kudo.conf to use kudo bmc-update Add PREFERRED_PROVIDER_virtual/bmc-update in kudo.conf to fix bmc_update build conflict with gbmc's bmc_update. Signed-off-by: Mustafa Shehabi Change-Id: Ideb5cbde0f4c94c7197984c1641223da1583111d --- meta-fii/meta-kudo/conf/machine/kudo.conf | 1 + meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index bcdbdfd2d..9f64c476b 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -34,6 +34,7 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" +PREFERRED_PROVIDER_virtual/bmc-update = "kudo-bmc-update" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps" # Remove unneeded binaries from image IMAGE_FEATURES:remove = "obmc-health-monitor" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb index 71daad346..0b7cfbee0 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 DEPENDS += "phosphor-ipmi-flash" RDEPENDS:${PN} += "bash" - +RPROVIDES:${PN} += "virtual/bmc-update" FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" SRC_URI:append:kudo = " \ -- cgit v1.2.3 From 0fb270aeb5f3d22d0a1fd7cbd9ed3d8e6dd759ff Mon Sep 17 00:00:00 2001 From: XP Chen Date: Thu, 26 Aug 2021 17:30:19 -0500 Subject: meta-fii/meta-kudo: Modify kudo-fw.sh SCP EEPROM update methods 1. Update both primary and backup SCP EEPROMS when updating the BIOS Modify the 2. Switch the SCP mux correctly on EVT and DVT hw Signed-off-by: XP Chen Change-Id: Idd07f4b57bfd2eaa13795f60b653915f1cf7c161 --- .../kudo-fw-utility/kudo-fw/kudo-fw.sh | 58 ++++++++++++---------- .../kudo-sys-utility/kudo-boot/init_once.sh | 10 +++- 2 files changed, 42 insertions(+), 26 deletions(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index a63c3e61c..5e0763a64 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -23,14 +23,14 @@ function fwbios() { if [ ! -f $1 ]; then echo " Cannot find the" $1 "image file" - exit 1 + return 1 fi echo "Flashing BIOS @/dev/$BIOS_MTD" flashcp -v $1 /dev/$BIOS_MTD if [ $? -ne 0 ]; then echo "Flashing the bios failed " >&2 - exit 1 + return 1 fi wait @@ -47,17 +47,19 @@ function fwbios() { # nvparm -s 0x1 -o 0x5F0638 if [ $? -ne 0 ]; then echo "Setting default nvparms failed " >&2 - exit 1 + return 1 fi if [[ $(find ${1} -type f -size +17156k 2>/dev/null) ]]; then echo "Extracting the SCP from the image" dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img + # Update both primary and backup EEPROM fwscp /run/initramfs/myscp.img + fwscpback /run/initramfs/myscp.img fi - rm -f $1 - exit 0 + + return 0 } function fwbmccpld() { @@ -66,12 +68,12 @@ function fwbmccpld() { loadsvf -d /dev/jtag0 -s $1 -m 0 if [ $? -ne 0 ]; then echo "BMC CPLD update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 218 out 1 - rm -f $1 - exit 0 + + return 0 } function fwmbcpld() { @@ -82,47 +84,49 @@ function fwmbcpld() { loadsvf -d /dev/jtag0 -s $1 -m 0 if [ $? -ne 0 ]; then echo "Mobo CPLD update failed" >&2 - exit 1 + return 1 fi wait - rm -f $1 - exit 0 + + return 0 } function fwscp() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU + scp_eeprom_sel=`get_gpio_ctrl 168` set_gpio_ctrl 168 out 1 set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 if [ $? -ne 0 ]; then echo "SCP eeprom update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out 1 - rm -f $1 - exit 0 + set_gpio_ctrl 168 out $scp_eeprom_sel + + return 0 } function fwscpback() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU + scp_eeprom_sel=`get_gpio_ctrl 168` set_gpio_ctrl 168 out 0 set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 if [ $? -ne 0 ]; then echo "SCP BACKUP eeprom update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out 1 - rm -f $1 - exit 0 + set_gpio_ctrl 168 out $scp_eeprom_sel + + return 0 } function fwmb_pwr_seq(){ @@ -130,24 +134,23 @@ function fwmb_pwr_seq(){ #$2 0x41 seq config file if [[ ! -e $1 ]]; then echo "$1 file does not exist" - exit 1 + return 1 fi if [[ ! -e $2 ]]; then echo "$2 file does not exist" - exit 1 + return 1 fi echo 32-0040 > /sys/bus/i2c/drivers/adm1266/unbind echo 32-0041 > /sys/bus/i2c/drivers/adm1266/unbind adm1266_fw_fx $1 $2 if [ $? -ne 0 ]; then echo "The power seq flash failed" >&2 - exit 1 + return 1 fi echo 32-0040 > /sys/bus/i2c/drivers/adm1266/bind echo 32-0041 > /sys/bus/i2c/drivers/adm1266/bind - rm -f $1 - rm -f $2 - exit 0 + + return 0 } if [[ ! $(which flashcp) ]]; then @@ -189,3 +192,8 @@ case $1 in *) ;; esac +ret=$? + +rm -f $2 $3 + +exit $ret diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh index 5145009a6..adb86f238 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh @@ -1,15 +1,23 @@ #!/bin/bash source /usr/sbin/kudo-lib.sh +# 0 for EVT. DVT will have a non-zero board version +boardver=$(printf '%d' `cat /sys/bus/i2c/drivers/fiicpld/34-0076/CMD00 | awk '{print $6}'`) # sleep so that FRU and all ipmitool Devices are ready before HOST OS # gpio 143 for HPM_STBY_RST_N do to DC-SCM spec set_gpio_ctrl 143 out 1 -sleep 5 # for the MUX to get ready +sleep 5 # for the MUX to get ready # set all mux route to CPU before power on host # BMC_CPU_RTC_I2C_SEL #120 set_gpio_ctrl 120 out 1 # BMC_CPU_DDR_I2C_SEL #84 set_gpio_ctrl 84 out 1 +# On EVT machines, the secondary SCP EEPROM is used. +# Set BMC_I2C_BACKUP_SEL to secondary. +if [[ $boardver == 0 ]]; then + echo "EVT system. Choosing secondary SCP EEPROM." + set_gpio_ctrl 168 out 0 +fi # BMC_CPU_EEPROM_I2C_SEL #85 set_gpio_ctrl 85 out 1 # BMC_CPU_PMBUS_SEL #86 -- cgit v1.2.3 From 4450f15b4a9aebc16582a2b932ae7712540012cf Mon Sep 17 00:00:00 2001 From: XP Chen Date: Mon, 30 Aug 2021 22:15:35 -0500 Subject: meta-fii/meta-kudo: Fix distro/conf with correct version yocto syntax Signed-off-by: XP Chen Change-Id: I276c7333f9f01949db2387735edb5d9a97c4fa1d --- meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf index 50e6ab35a..c64588405 100644 --- a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf +++ b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf @@ -2,4 +2,4 @@ require conf/distro/openbmc-phosphor.conf require conf/distro/gbmc.conf DISTRO = "openbmc-kudo" -VERSION_ID_kudo = "v0.d-00-kudo" +VERSION_ID:kudo = "v0.d-00-kudo" -- cgit v1.2.3 From 96e4b26997eb479cadfc8dea6ea0c089608de7e5 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Tue, 31 Aug 2021 15:00:29 -0500 Subject: meta-fii/meta-kudo: Support SMBIOS Enable support for smbios-mdr using IPMI BLOB transport protocol, and disable the cpuinfo feature. Signed-off-by: Charles Boyer Change-Id: I035889f3ce0792a06c85a8ea713a19e24c24e546 --- .../meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 1 + meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index d2e3ebd26..800efde74 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -42,6 +42,7 @@ RDEPENDS:${PN}-kudo-system = " \ kudo-boot \ kudo-cmd \ phosphor-state-manager \ + smbios-mdr \ " SUMMARY:${PN}-kudo-fw = "kudo Firmware" diff --git a/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend b/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend new file mode 100644 index 000000000..c665531a4 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend @@ -0,0 +1,3 @@ +PACKAGECONFIG:append:kudo = " smbios-ipmi-blob" + +PACKAGECONFIG:remove:kudo = " cpuinfo" -- cgit v1.2.3 From 39b9c42d60839c91d920561cff6e23df552966a8 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Thu, 26 Aug 2021 15:17:41 -0500 Subject: meta-fii/meta-kudo: Increase rate-limit for rsyslog The SEL Record IDs are observed to skip in /var/log/ipmi_sel and the issue has been traced to the rate-limit of rsyslog. When messages are dropped due to rate-limiting, some of them are SEL messages. Phosphor-sel-logger is inserting the Record ID into the message without checking if previous records make it into ipmi_sel. This causes the skip in Record IDs. To prevent SEL messages from being dropped, the rate-limit has been increased. The side-effect is that more messages are being allowed within a minute to lower performance. Signed-off-by: Charles Boyer Change-Id: Iff015e1f45e7f79f73d1a03d05af88832b6f972d --- meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 46a287eef..b98610635 100644 --- a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -8,11 +8,11 @@ # Ported from debian's sysklogd.conf # Journal-style logging -# Limit to no more than 2000 entries in one minute and enable the +# Limit to no more than 4000 entries in one minute and enable the # journal workaround to avoid duplicate entries module(load="imjournal" StateFile="/var/log/state" RateLimit.Interval="60" - RateLimit.Burst="2000") + RateLimit.Burst="4000") # Template for IPMI SEL messages # " ,,,[,,]" -- cgit v1.2.3 From e83c22094b7e4970c96bcee273ab08d05bbc0a30 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:17:33 -0500 Subject: meta-phosphor: change systemd.bbclass to match upstream override syntax Upstream bbclasses changed to typically use the `:${PN}` override syntax, including the SYSTEMD_ variables. Change our systemd.bbclass to do the same for consistency and perform a tree-wide variable replacement. Spot checked by building bletchley and witherspoon and checking some of the SYSTEMD_LINK directives on installed packages under qemu. Signed-off-by: Patrick Williams Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb --- .../recipes-ac01/host/ampere-hostctrl.bb | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- .../recipes-ampere/platform/mtjade-gpio-config.bb | 4 +-- .../recipes-phosphor/gpio/fault-monitor.bb | 4 +-- .../recipes-phosphor/gpio/host-gpio-handling.bb | 4 +-- .../meta-jade/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../recipes-phosphor/gpio/psu-hotswap-reset.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/gpio/id-button.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/power-workarounds.bb | 2 +- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 6 ++-- .../dbus/phosphor-dbus-monitor_%.bbappend | 4 +-- meta-ibm/recipes-phosphor/fans/fan-watchdog.bb | 6 ++-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 38 +++++++++++----------- meta-ibm/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 8 ++--- .../leds/phosphor-led-manager_%.bbappend | 2 +- .../recipes-phosphor/logging/ibm-logging_git.bb | 2 +- .../power/phosphor-power_%.bbappend | 2 +- .../power/witherspoon-power-supply-sync.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vcs-control.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../power/phosphor-power_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- ...openpower-software-manager-virtual-pnor.bbclass | 8 ++--- .../flash/phosphor-software-manager_%.bbappend | 2 +- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 4 +-- .../recipes-phosphor/host/checkstop-monitor.bb | 6 ++-- .../recipes-phosphor/host/p9-cfam-override.bb | 2 +- .../recipes-phosphor/host/p9-host-start.bb | 2 +- .../occ/openpower-occ-control_git.bb | 6 ++-- .../classes/obmc-phosphor-systemd.bbclass | 12 +++---- .../chassis/obmc-host-failure-reboots.bb | 2 +- .../chassis/obmc-op-control-power_git.bb | 24 +++++++------- .../recipes-phosphor/fans/phosphor-fan_git.bb | 14 ++++---- .../host/obmc-op-control-host_git.bb | 2 +- .../ipmi/phosphor-ipmi-host_git.bb | 2 +- .../leds/phosphor-led-manager_git.bb | 6 ++-- meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 2 +- .../state/phosphor-state-manager_git.bb | 12 +++---- meta-phosphor/recipes-phosphor/video/fbterm_git.bb | 2 +- .../watchdog/phosphor-watchdog_git.bb | 8 ++--- .../recipes-phosphor/chassis/ir38163-workaround.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../gpio/phosphor-gpio-monitor_%.bbappend | 28 ++++++++-------- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../watchdog/phosphor-watchdog_%.bbappend | 8 ++--- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- 81 files changed, 207 insertions(+), 207 deletions(-) (limited to 'meta-fii') diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb index c6ee5d0e2..03f0d58ad 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -24,12 +24,12 @@ HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset@.service" HOST_WARM_REBOOT_FORCE_INSTMPL = "ampere-host-force-reset@{0}.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" HOST_ON_RESET_HOSTTMPL = "ampere-host-on-host-check@.service" HOST_ON_RESET_HOSTINSTMPL = "ampere-host-on-host-check@{0}.service" HOST_ON_RESET_HOSTTGTFMT = "obmc-host-startmin@{0}.target" HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT}.requires/${HOST_ON_RESET_HOSTINSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}" diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index e8ef45d60..b25ba5d94 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" FILES:${PN} += "${systemd_system_unitdir}/*" diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb index cc79f5b1a..8886fec6c 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb @@ -28,14 +28,14 @@ CHASSIS_POWERON_SVC = "ampere-gpio-poweron@.service" CHASSIS_POWERON_INSTMPL = "ampere-gpio-poweron@{0}.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" # chassis power off CHASSIS_POWEROFF_SVC = "ampere-gpio-poweroff@.service" CHASSIS_POWEROFF_INSTMPL = "ampere-gpio-poweroff@{0}.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb index 49376ee9b..4994183a0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb @@ -19,7 +19,7 @@ do_install() { OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \ +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/gpio/s0_fault_alert \ obmc/gpio/s1_fault_alert \ " @@ -29,5 +29,5 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere_fault_led.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb index cde625f5b..79bfb726e 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack" -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/reboot_ack \ obmc/gpio/shutdown_ack \ " @@ -20,4 +20,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere-host-shutdown-ack@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb index 8e57c3ea2..c1a616a9c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb @@ -16,7 +16,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -26,4 +26,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index c6400c2f0..527cbbda0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb index 2ca18a0be..839c6d4d1 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -13,7 +13,7 @@ OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" # Copies config file having arguments for psu # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \ obmc/gpio/PSU2_B25 \ " SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" @@ -29,4 +29,4 @@ GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index d7128f4f4..5150e2312 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -16,11 +16,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 43a6f17d5..a77a59be0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,7 +21,7 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}" ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" do_install:append:mtjade() { SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 140154990..970b12c6a 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index 461aeb5d4..f7daa94a8 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -37,42 +37,42 @@ SYSTEMD_SERVICE:${PN} = " \ HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" # Force the power cycle target to run the ampere power cycle HOST_REBOOT_SVC = "ampere-host-power-cycle.service" HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite the host reset to graceful reset HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite force reboot HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 787ddabc6..020212ad8 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 13b8535a5..573c0b869 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index 52fc793ac..36b77a03d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -28,6 +28,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_DIS}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 7981baa0c..f25f35442 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -24,4 +24,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 3cbf82408..a7bebeb1c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e3d012247..703cac279 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index c46926f90..1ae5699b7 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -31,6 +31,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" -SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index 2d00264dc..6ab0ae2d2 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -23,4 +23,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a9ef7fae..cc297d27b 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -37,6 +37,6 @@ FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRU SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}" -SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 3071cb4c9..6731a7abb 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,2 @@ -SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" -SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index ad44ba346..4673c44c0 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -18,6 +18,6 @@ WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" -SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" +SYSTEMD_LINK:${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 8b4e91e93..469f76539 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -19,42 +19,42 @@ FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to also start at poweron FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it PACKAGECONFIG:append:witherspoon = " json" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 01df2ea5b..3e53f9d08 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 272a8a1f5..6bb236463 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,10 +5,10 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 57fb62b35..f734bf530 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test and OperationalStatus monitor feature for diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 8d6e64073..6a0e18189 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -41,7 +41,7 @@ DBUS_SERVICE:${PN} += "${SERVICE}" #The BindsTo in the service will not do the restart, it will only do the #original start and a stop. LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" +SYSTEMD_LINK:${PN} += "${LOG_FMT}" do_install:append(){ diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 9acaad768..c8d6a4617 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -21,4 +21,4 @@ do_install:append(){ FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4c4c88401..74bb9a0c5 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -13,4 +13,4 @@ TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" -SYSTEMD_LINK_${PN} += "${SYNC_FMT}" +SYSTEMD_LINK:${PN} += "${SYNC_FMT}" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 080025ead..7932eb3a0 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -106,16 +106,16 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 7d904461f..e2f146854 100644 --- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # utilize a 600s default timer config for p10bmc -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " obmc/watchdog/poweron" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index 4aebf6f24..b272dfe31 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_avsbus.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 3c7b92eaa..903ce4545 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_vcs.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 005a1e497..ce9c697de 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,5 +7,5 @@ INSTFMT = "phosphor-gpio-presence@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" +SYSTEMD_LINK:${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 1ce381522..07b7a382c 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -33,5 +33,5 @@ ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" # compose_list is not defined immediately so don't use := -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 319cd1658..79a13f695 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -14,8 +14,8 @@ FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 5fd911433..aa3b357a2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index 38efc160d..427018808 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -6,7 +6,7 @@ SRC_URI += "file://psu.json" PACKAGECONFIG:append = " monitor" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" do_install:append() { install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index aacdd181a..4f8fd6e8b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -26,5 +26,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 867c388bd..863f59c38 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -16,4 +16,4 @@ ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb index 956a62377..89b5b83e6 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://lanyang_avsbus.sh" RDEPENDS_${PN} += "i2c-tools" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index eb8196ff3..deeb2f9eb 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_lanyang := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_lanyang := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 7a2345ebc..4098609cb 100644 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,4 +15,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9a26ca04e..1e0803c06 100644 --- a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -12,4 +12,4 @@ HR855XG2_ITEMS += "iio-hwmon.conf" HR855XG2_ITEMS += "iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass index 61822f1d4..d37ebc30e 100644 --- a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass +++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass @@ -26,8 +26,8 @@ HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target" CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-vpnor-check-clearvolatile@{0}.service" CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" # Chassis target installation - always enable and clear in chassis # power on @@ -36,5 +36,5 @@ ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_ CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 5255be429..9df8193be 100644 --- a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend:df-openpower := "${THISDIR}/${PN}:" -SYSTEMD_OVERRIDE_${PN}-updater:append:df-openpower = \ +SYSTEMD_OVERRIDE:${PN}-updater:append:df-openpower = \ " software-bmc-updater.conf:xyz.openbmc_project.Software.BMC.Updater.service.d/software-bmc-updater.conf" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index a76acb44c..05d07ddb8 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -18,5 +18,5 @@ FMT_SCAN_HOST = "../${TMPL_SCAN}:${TGTFMT_HOST}.wants/${INSTFMT_SCAN}" SYSTEMD_SERVICE:${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 83f3a3e03..9b1b1c4c5 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -14,7 +14,7 @@ OBMC_HOST_MONITOR_INSTANCES = "checkstop" # Copies config file having arguments for monitoring host checkstop # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/checkstop" # This package is not supplying the unit file and also this is not a native # recipe since state-mgmt needs this package at runtime. Unsetting this below @@ -22,10 +22,10 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" SYSTEMD_SERVICE:${PN} ?="" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" +SYSTEMD_OVERRIDE:${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" STATES = "startmin" GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{1}.service" CHECKSTOP_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:obmc-host-{0}@{2}.target.wants/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index 0a189e8c6..d779785e4 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -17,4 +17,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index f735c0f82..549bbe242 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-host-startmin@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 3903ef616..440829175 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -55,8 +55,8 @@ OCC_TMPL = "op-occ-{0}@.service" HOST_TGTFMT = "obmc-host-{1}@{2}.target" OCC_INSTFMT = "op-occ-{0}@{2}.service" HOST_OCC_FMT = "../${OCC_TMPL}:${HOST_TGTFMT}.wants/${OCC_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" # Set the occ disable service to be executed on host error HOST_ERROR_TARGETS = "crash timeout" @@ -66,7 +66,7 @@ HOST_ERROR_TGTFMT = "obmc-host-{0}@{1}.target" OCC_DISABLE_INSTFMT = "op-occ-disable@{1}.service" HOST_ERROR_FMT = "../${OCC_DISABLE_TMPL}:${HOST_ERROR_TGTFMT}.wants/${OCC_DISABLE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" S = "${WORKDIR}/git" diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index baea3af02..c67fc021f 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -25,16 +25,16 @@ # SYSTEMD_USER_${unit}.service = "foo" # The user for the unit/package. # -# SYSTEMD_ENVIRONMENT_FILE_${PN} = "foo" +# SYSTEMD_ENVIRONMENT_FILE:${PN} = "foo" # One or more environment files to be installed. # -# SYSTEMD_LINK_${PN} = "tgt:name" +# SYSTEMD_LINK:${PN} = "tgt:name" # A specification for installing arbitrary links in # the ${systemd_system_unitdir} namespace, where: # tgt: the link target # name: the link name, relative to ${systemd_system_unitdir} # -# SYSTEMD_OVERRIDE_${PN} = "src:dest" +# SYSTEMD_OVERRIDE:${PN} = "src:dest" # A specification for installing unit overrides where: # src: the override file template # dest: the override install location, relative to ${systemd_system_unitdir} @@ -230,11 +230,11 @@ python() { unit_exist = check_sd_unit(d, unit) add_sd_unit(d, unit, pkg, unit_exist) add_sd_user(d, unit.name, pkg) - for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE_%s' % pkg): + for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE:%s' % pkg): add_env_file(d, name, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_LINK_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_LINK:%s' % pkg): install_link(d, spec, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE:%s' % pkg): add_override(d, spec, pkg) } diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index 84403d57b..b21440d89 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -12,4 +12,4 @@ INSTFMT = "host-failure-reboots@{0}.service" LINK_FMT = "${TMPL}:${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8c0394f2a..8e0e38a0c 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -24,7 +24,7 @@ SYSTEMD_SERVICE:${PN} += " \ op-powered-off@.service \ " -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/power_control" START_TMPL = "op-power-start@.service" START_TGTFMT = "obmc-chassis-poweron@{1}.target" @@ -59,38 +59,38 @@ RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" # Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target" START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Chassis off requires host off STOP_TMPL_CTRL = "obmc-host-stop@.target" STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" # Hard power off requires chassis off HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 9e0149382..0cf6a5968 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -60,10 +60,10 @@ FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" # JSON mode also gets linked into multi-user -SYSTEMD_LINK_${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" # Package the JSON config files installed from the repo @@ -105,10 +105,10 @@ SYSTEMD_SERVICE:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', # JSON: Linked to multi-user and poweron # YAML: Linked to fans-ready and fan control-init poweron -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -141,11 +141,11 @@ SYSTEMD_SERVICE:${PN}-monitor += "${TMPL_MONITOR}" SYSTEMD_SERVICE:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" # JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -163,4 +163,4 @@ PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monit FILES:sensor-monitor += " ${bindir}/sensor-monitor" SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" -SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" +SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb index 1a6d165b2..ffe2f366e 100644 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -23,4 +23,4 @@ START_TGTFMT = "obmc-host-startmin@{1}.target" START_INSTFMT = "op-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 1a1199f73..03d4e4f2f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -103,7 +103,7 @@ FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" #Collect all hardcoded sensor yamls from different recipes and #merge all of them with sensor.yaml. diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 341c5f73b..3bfd47d05 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -39,7 +39,7 @@ DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" @@ -47,10 +47,10 @@ TMPLFMT = "obmc-led-group-{1}@.service" TGTFMT = "obmc-chassis-{0}@0.target" INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index c7273a032..3f2ae8622 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -37,7 +37,7 @@ FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "mboxd.service" SYSTEMD_SERVICE:${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" # Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 83939c468..408096698 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -174,12 +174,12 @@ SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" SRCREV = "0d1c3f1f9329c853677f0581287afef83eeea0f0" diff --git a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb index 57e217450..8480bc60b 100644 --- a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb +++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb @@ -26,4 +26,4 @@ do_install() { } SYSTEMD_SERVICE:${PN} += "fbterm.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "fbterm" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "fbterm" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index b0d9c61cd..d0c91bf0f 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -28,10 +28,10 @@ EXTRA_OEMESON = " \ " # Copies config file having arguments for host watchdog -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/watchdog/poweron" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" # For now, watching PowerOn is the only usecase OBMC_HOST_WATCHDOG_INSTANCES = "poweron" @@ -51,5 +51,5 @@ ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" WATCHDOG_FMT = "../${WATCHDOG_TMPL}:obmc-host-startmin@{1}.target.wants/${WATCHDOG_TGTFMT}" ENABLE_WATCHDOG_FMT = "../${ENABLE_WATCHDOG_TMPL}:obmc-host-startmin@{0}.target.wants/${ENABLE_WATCHDOG_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb index fb9a728e3..0ac6c8ecd 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb @@ -19,9 +19,9 @@ FMT_REMOVE = "../${IR_REMOVE}:${TGTFMT_OFF}.wants/${INSTIR_REMOVE}" FMT_ADD = "../${IR_ADD}:${TGTFMT_ON}.requires/${INSTIR_ADD}" SYSTEMD_SERVICE_${PN} += "${IR_REMOVE}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${IR_ADD}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://ir38163_workaround.sh" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 195626d7a..ec17b3bbf 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 12d043cc4..1066cb215 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -19,4 +19,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index edf81760f..c9a0c38c3 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -8,25 +8,25 @@ TMPL_PRESENT = "phosphor-gpio-presence@.service" INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service" PRESENT_TGT = "multi-user.target" FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-0.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-1.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-2.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-3.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-4.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-5.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-6.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-7.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-8.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-9.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-10.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-11.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-0.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-1.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-2.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-3.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-4.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-5.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-6.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-7.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-8.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-9.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-10.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-11.conf" GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11" -SYSTEMD_LINK_${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" do_install:append:gbs() { install -d ${D}${systemd_system_unitdir} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index f36178d35..b9ea43e1c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -11,14 +11,14 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" EXTRA_OECONF:append:gbs = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 657684d7a..723ac418d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -22,12 +22,12 @@ GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}" GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 23b063fc3..7ad4e2521 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " obmc/watchdog/host0" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " obmc/watchdog/host0" OBMC_HOST_WATCHDOG_INSTANCES_A = "host0" WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service" -SYSTEMD_OVERRIDE_${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_OVERRIDE:${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \ phosphor-host-watchdog-reset.service \ phosphor-host-watchdog-poweroff.service \ diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 2fb5443fb..d8e2cb14e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4363aa352..a27865239 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,9 +15,9 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 4db5c6501..04f25c1b0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -17,11 +17,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "${SYSTEMD_DEFAULT_TARGET}" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9874bc875..54b7ac14f 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -24,7 +24,7 @@ ITEMS = " \ " ENVS = "obmc/hwmon/ahb/apb/{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # PECI PECINAMES = " \ @@ -35,6 +35,6 @@ PECINAMES = " \ PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf" PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}" PECIENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" EXTRA_OEMESON:append:olympus-nuvoton = " -Dupdate-functional-on-fail=true" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 3953f8375..48bd7d2a1 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index a2da0e3b9..16cc2722a 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,6 +21,6 @@ Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" EXTRA_OEMESON:append:quanta-q71l = " -Dnegative-errno-on-fail=true" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb index 3e376e12b..59025ad62 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 8988ff1af..3038ad0b6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -13,5 +13,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend index cdd6bf0e7..dce22fc1c 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" -- cgit v1.2.3 From 06d4ce1d8a650d0fda0fcf8d326a8bc79dfba038 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Fri, 27 Aug 2021 16:52:59 -0500 Subject: meta-fii/meta-kudo: Select clears-sel option This will select the option within phosphor-sel-logger to clear the IPMI SEL through its Clear method. Then there will not be a Record ID sync issue from the clear of SEL and adding new entries. Signed-off-by: Charles Boyer Change-Id: I4ba21237b2726254b2a427d9bc26469c5267b565 --- .../recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 844a25b8f..9b203e722 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,2 @@ # Enable threshold, pulse, and watchdog monitoring -PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog" +PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog clears-sel" -- cgit v1.2.3