From 810bfe86714a29f214828e3b2476dce201123884 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Oct 2021 17:00:12 +0000 Subject: fb-ipmi-oem: srcrev bump 485f9b31cb..35d12546ca Patrick Williams (1): catch exceptions as const Change-Id: I98ce5f5a6f3fe329f0240ac140c2a7889120bee8 Signed-off-by: Andrew Geissler --- meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index ceade37d2..9a6a852de 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "485f9b31cbdc8e8aebdfb18729f541f41227522d" +SRCREV = "35d12546ca8da5e6d04096e9dcd27b83a0aa475a" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 97c1d92e7790df61fc67441edbc32c32d65a59f8 Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj Date: Thu, 21 Oct 2021 17:14:59 +0530 Subject: meta-yosemiteV2:Add x86-power-ctrl config files for multi host These config files contains the gpio configuartion which will be used by the x86 power control. PGood config is dbus based gpio configuration is added for all hosts. TESTED:Tested and verified in YosemiteV2. Signed-off-by: Logananth Sundararaj Change-Id: I94c12545b26ac3bae8226ac6434e61c7c1ee9e06 --- .../yosemitev2/power-config-host1.json | 52 ++++++++++++++++++++++ .../yosemitev2/power-config-host2.json | 52 ++++++++++++++++++++++ .../yosemitev2/power-config-host3.json | 52 ++++++++++++++++++++++ .../yosemitev2/power-config-host4.json | 52 ++++++++++++++++++++++ .../chassis/x86-power-control_%.bbappend | 11 +++++ 5 files changed, 219 insertions(+) create mode 100644 meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json create mode 100644 meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json create mode 100644 meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json create mode 100644 meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json new file mode 100644 index 000000000..8c8379e1e --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/1_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json new file mode 100644 index 000000000..ebf7bf029 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/2_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json new file mode 100644 index 000000000..3631dc392 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/3_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json new file mode 100644 index 000000000..dac58ae34 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/4_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend index c119baca9..862f2f179 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,2 +1,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" + +SRC_URI:append:yosemitev2 = " file://power-config-host1.json" +SRC_URI:append:yosemitev2 = " file://power-config-host2.json" +SRC_URI:append:yosemitev2 = " file://power-config-host3.json" +SRC_URI:append:yosemitev2 = " file://power-config-host4.json" + +do_install:append:yosemitev2() { + install -m 0755 -d ${D}/${datadir}/${BPN} + install -m 0644 -D ${WORKDIR}/*.json \ + ${D}/${datadir}/${BPN}/ +} -- cgit v1.2.3 From 9ad54785f7e64e72a8bae15a41bbc576fecb0132 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 11:30:27 +0000 Subject: fb-ipmi-oem: srcrev bump 35d12546ca..dd0415b507 Manojkiran Eda (1): Add OWNERS file Change-Id: Iffaa976f9522a806bbef6d257fd72e8b81d4b154 Signed-off-by: Andrew Geissler --- meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 9a6a852de..5dc4a60c7 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "35d12546ca8da5e6d04096e9dcd27b83a0aa475a" +SRCREV = "dd0415b50776fade388ac7523f8aabe6a8a9fb68" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From ade3e145ead0beedad181394fcaa63856176bdee Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:26:27 -0500 Subject: treewide: clean up use of OBMC_MACHINE_FEATURES Modify the machine meta-layer configs to remove the use of the OBMC_MACHINE_FEATURES indirection and favor the Yocto MACHINE_FEATURES variable instead. Signed-off-by: Patrick Williams Change-Id: Ifafb79e4e4c010e9476b9547cd4982f5b645060e --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 2 +- meta-ampere/meta-jade/conf/machine/mtjade.conf | 2 +- meta-bytedance/meta-g220a/conf/machine/g220a.conf | 2 +- meta-facebook/conf/machine/include/facebook-withhost.inc | 2 +- meta-facebook/conf/machine/include/facebook.inc | 2 +- meta-fii/meta-kudo/conf/machine/kudo.conf | 2 +- meta-hpe/conf/machine/include/hpe.inc | 2 +- meta-ibm/conf/machine/p10bmc.conf | 2 +- meta-intel-openbmc/conf/machine/include/intel.inc | 2 +- meta-inventec/conf/machine/include/inventec.inc | 2 +- meta-openpower/conf/machine/include/openpower.inc | 2 +- meta-openpower/conf/machine/include/p8.inc | 2 +- meta-openpower/conf/machine/include/p9.inc | 2 +- meta-quanta/meta-gsj/conf/machine/gsj.conf | 2 +- meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf | 2 +- meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf | 2 +- meta-supermicro/conf/machine/include/supermicro.inc | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'meta-facebook') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 2ac82cade..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES = "115200;ttyS4" FLASH_SIZE = "32768" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index a47ebef8a..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -16,7 +16,7 @@ FLASH_RWFS_OFFSET = "43008" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ obmc-chassis-state-mgmt \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index ba7a253e3..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -10,7 +10,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-aspeednic-use-mac2.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-ipmi \ diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..8567f696c 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,6 +1,6 @@ require conf/machine/include/facebook.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-host-ipmi \ obmc-host-state-mgmt \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index d18a66bf5..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 9f64c476b..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" SERIAL_CONSOLES = "115200;ttyS0" -OBMC_MACHINE_FEATURES += " \ +MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 74b1a2c6d..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 1891129a4..b714f78d3 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -15,7 +15,7 @@ require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc DISTRO_FEATURES += "ibm-service-account-policy" -OBMC_MACHINE_FEATURES += 'phal' +MACHINE_FEATURES += 'phal' SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 738d103e5..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 02b0df685..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 65d9a8aef..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc index af269c23e..eb262cbf7 100644 --- a/meta-openpower/conf/machine/include/p8.inc +++ b/meta-openpower/conf/machine/include/p8.inc @@ -1,2 +1,2 @@ include conf/machine/include/ibm-power8-cpu.inc -OBMC_MACHINE_FEATURES += 'i2c-occ' +MACHINE_FEATURES += 'i2c-occ' diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc index 2da9fd144..5c1779322 100644 --- a/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openpower/conf/machine/include/p9.inc @@ -1,3 +1,3 @@ include conf/machine/include/ibm-power9-cpu.inc -OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' +MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index c5089e804..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -11,7 +11,7 @@ require conf/machine/include/obmc-bsp-common.inc IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" IMAGE_FSTYPES += " mtd-ubi-tar" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index 7fadd1aba..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -16,7 +16,7 @@ IGPS_MACHINE = "RunBMC" IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index 2bcaeaaa1..935bd99ca 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -11,7 +11,7 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" # If we included the openpower.inc we'd get these from that. -#OBMC_MACHINE_FEATURES += "\ +#MACHINE_FEATURES += "\ # obmc-phosphor-fan-mgmt \ # obmc-phosphor-chassis-mgmt \ # obmc-phosphor-flash-mgmt \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index bb26af880..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ -- cgit v1.2.3 From 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 15:30:00 -0500 Subject: treewide: remove obmc-system-mgmt feature Every machine layer treats 'system-management' as either part of a package-group or removes the feature. The sample implementation in meta-phosphor is a do-nothing shell script (and up until recently was a Python script). There appears to be no useful purpose to this feature as a stand-alone concept, so remove it. Signed-off-by: Patrick Williams Change-Id: I20ca1fa8ff3cb01cac2d07d4ded84e0769e4514b --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 - .../packagegroups/packagegroup-amd-apps.bb | 2 -- .../packagegroups/packagegroup-ampere-apps.bb | 2 -- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 - .../meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 - .../packagegroups/packagegroup-asrock-apps.bb | 2 -- meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 - .../packagegroups/packagegroup-bytedance-apps.bb | 2 -- meta-facebook/conf/machine/include/facebook.inc | 1 - .../packagegroups/packagegroup-fb-apps.bb | 2 -- meta-fii/meta-kudo/conf/machine/kudo.conf | 1 - .../packagegroups/packagegroup-kudo-apps.bb | 2 -- meta-hpe/conf/machine/include/hpe.inc | 1 - .../packagegroups/packagegroup-hpe-apps.bb | 2 -- .../meta-on5263m5/conf/machine/on5263m5.conf | 1 - .../packagegroups/packagegroup-inspur-apps.bb | 2 -- meta-intel-openbmc/conf/machine/include/intel.inc | 1 - .../packagegroups/packagegroup-intel-apps.bb | 2 -- meta-inventec/conf/machine/include/inventec.inc | 1 - .../packagegroups/packagegroup-inventec-apps.bb | 2 -- meta-openpower/conf/machine/include/openpower.inc | 1 - .../packagegroups/packagegroup-op-apps.bb | 2 -- meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 -- .../conf/distro/include/phosphor-base.inc | 1 - .../conf/distro/include/phosphor-defaults.inc | 2 -- .../recipes-phosphor/images/obmc-phosphor-image.bb | 1 - .../recipes-phosphor/system/obmc-phosphor-sysd.bb | 18 ---------------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.service | 10 --------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.sh | 24 ---------------------- meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 - meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 - .../conf/machine/olympus-nuvoton.conf | 1 - .../packagegroup-olympus-nuvoton-apps.bb | 2 -- .../conf/machine/include/supermicro.inc | 1 - .../packagegroups/packagegroup-supermicro-apps.bb | 2 -- 35 files changed, 99 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh (limited to 'meta-facebook') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 91ca5bb1b..cc9f95673 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,7 +31,6 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 06938055c..758e5b3ca 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index ede8d9db5..ac820590f 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -13,11 +13,9 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 633efa012..bd82e61c5 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,7 +38,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index 38fb811ff..b960c743d 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,7 +9,6 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index e9f676dc8..c3af264a3 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,10 +10,8 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 516e31683..6e89d146d 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,7 +30,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 173805635..0de1880bc 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 43a0c2222..415816db8 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..febd160af 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,12 +18,10 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index e065f2086..534df3581 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,7 +30,6 @@ MACHINE_FEATURES += " \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" -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" 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 800efde74..e916c0f5f 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 @@ -12,11 +12,9 @@ PACKAGES = " \ " 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" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 281d2d544..79896c713 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,7 +15,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 3f16d41e7..9fdcd4b2e 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 1c217913e..6017a8885 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,7 +7,6 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 68a2184cf..2d95e2332 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 623cd7910..4287ddd80 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 303a04b3d..69a523475 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 9a9e9f574..0f8419e42 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,7 +17,6 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 7996cda5b..374b279a9 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,13 +15,11 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index f6c48bfb0..348361e87 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,7 +18,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 890967f96..e20def697 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 80c16d22e..572ec80f1 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,7 +27,6 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management -# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -59,7 +58,6 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" -FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 64f293cf0..0e7e84945 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,7 +91,6 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ - obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 8673a15c1..948a09051 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -97,8 +97,6 @@ VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager" # Provide support for monitoring BMC core dumps VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" - # phosphor-hwmon-config # # The phosphor-hwmon package can have its configuration generated diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 494b06c7c..85b7f0448 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,7 +29,6 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ - obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb deleted file mode 100644 index 06eb55ec2..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Phosphor OpenBMC System Management" -DESCRIPTION = "Phosphor OpenBMC system management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-dbus-service - -PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES:${PN} += "virtual-obmc-system-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${BPN}.sh" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${BPN}.sh ${D}${bindir}/${BPN} -} diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service deleted file mode 100644 index 246d985ba..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor System Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-sysd -SyslogIdentifier=obmc-phosphor-sysd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh deleted file mode 100644 index 95488d04d..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -echo "obmc-phosphor-sysd starting..." - -while true -do - sleep 60 -done diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 8fb72f286..4a65c5dcb 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,7 +49,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index ce58a91c3..8b9a1f823 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,7 +44,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index a90e77bf6..b45d74591 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,6 +29,5 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index d462d6905..6d69400e9 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index d663f445a..c8a762f77 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 4549bf70f..6a24fadc6 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From 552e93e6ec8d72befcbe7ea59c3a57968f6603dc Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 27 Oct 2021 10:15:20 -0500 Subject: meta-facebook: fix shellcheck issues in scripts Signed-off-by: Patrick Williams Change-Id: I62cf17d414795e91d673d468a196d4f0a6c0a71b --- .../recipes-fb/fb-powerctrl/files/power-util | 88 +++++++++++----------- .../recipes-fb/fb-powerctrl/files/setup_gpio.sh | 8 +- .../flash/phosphor-software-manager/bios-update.sh | 35 ++++----- meta-phosphor/scripts/run-repotest | 3 - 4 files changed, 66 insertions(+), 68 deletions(-) (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util index 30fa34cc8..d00dfde7f 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util @@ -1,83 +1,83 @@ #!/bin/bash # Usage of this utility function usage() { - echo "usage: power-util mb [on|off|status|cycle|reset]"; - echo " power-util sled-cycle" + echo "usage: power-util mb [on|off|status|cycle|reset]"; + echo " power-util sled-cycle" } power_off() { - echo "Shutting down Server $2" - busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off + echo "Shutting down Server" + busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off } power_on() { - echo "Powering on Server $2" - busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On + echo "Powering on Server" + busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On } power_status() { - st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) - if [ "$st" == "On\"" ]; then - echo "on" - else - echo "off" - fi + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi } power_reset() { - echo "Reset on server $2" - busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset + echo "Reset on server" + busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset } sled_cycle() { - i2cset -y 7 0x45 0xd9 c + i2cset -y 7 0x45 0xd9 c } -if [ $1 == "sled-cycle" ]; then - echo "SLED_CYCLE starting at $(date)" - sled_cycle - exit 0; +if [ "$1" == "sled-cycle" ]; then + echo "SLED_CYCLE starting at $(date)" + sled_cycle + exit 0; fi if [ $# -lt 2 ]; then - echo "Total number of parameter=$#" - echo "Insufficient parameter" - usage; - exit 0; + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; fi -if [ $1 != "mb" ]; then - echo "Invalid parameter1=$1" - usage; - exit 0; +if [ "$1" != "mb" ]; then + echo "Invalid parameter1=$1" + usage; + exit 0; fi -if [ $2 = "on" ]; then - if [ $(power_status) == "off" ]; then - power_on +if [ "$2" = "on" ]; then + if [ "$(power_status)" == "off" ]; then + power_on fi -elif [ $2 = "off" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" = "off" ]; then + if [ "$(power_status)" == "on" ]; then + power_off fi -elif [ $2 == "cycle" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" == "cycle" ]; then + if [ "$(power_status)" == "on" ]; then + power_off else echo "WARNING: Powering on server" fi - power_on -elif [ $2 == "reset" ]; then - if [ $(power_status) == "on" ]; then - power_reset + power_on +elif [ "$2" == "reset" ]; then + if [ "$(power_status)" == "on" ]; then + power_reset else echo "ERROR: Server not powered on" fi -elif [ $2 == "status" ]; then - power_status +elif [ "$2" == "status" ]; then + power_status else - echo "Invalid parameter2=$2" - usage; + echo "Invalid parameter2=$2" + usage; fi exit 0; diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh index 2624abd0d..cac3b20c7 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh @@ -7,16 +7,16 @@ function set_gpio_active_low() { return; fi - echo $1 > /sys/class/gpio/export - echo $2 > /sys/class/gpio/gpio$1/direction + echo "$1" > /sys/class/gpio/export + echo "$2" > "/sys/class/gpio/gpio$1/direction" } GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) # FM_BMC_READY_N, GPIO S1, active low -set_gpio_active_low $((${GPIO_BASE} + 144 +1)) low +set_gpio_active_low $((GPIO_BASE + 144 +1)) low # FP_PECI_MUX, active low -set_gpio_active_low $((${GPIO_BASE} + 212)) high +set_gpio_active_low $((GPIO_BASE + 212)) high exit 0; diff --git a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh index fd1c52b2a..4b99f0be4 100755 --- a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh @@ -20,16 +20,16 @@ set_gpio_to_bmc() echo "switch bios GPIO to bmc" if [ ! -d /sys/class/gpio/gpio$GPIO ]; then cd /sys/class/gpio - echo $GPIO > export + echo $GPIO > "export" cd gpio$GPIO else cd /sys/class/gpio/gpio$GPIO fi - direc=`cat direction` - if [ $direc == "in" ]; then + direc=$(cat direction) + if [ "$direc" == "in" ]; then echo "out" > direction fi - data=`cat value` + data=$(cat value) if [ "$data" == "0" ]; then echo 1 > value fi @@ -41,16 +41,16 @@ set_gpio_to_pch() echo "switch bios GPIO to pch" if [ ! -d /sys/class/gpio/gpio$GPIO ]; then cd /sys/class/gpio - echo $GPIO > export + echo $GPIO > "export" cd gpio$GPIO else cd /sys/class/gpio/gpio$GPIO fi - direc=`cat direction` - if [ $direc == "in" ]; then + direc=$(cat direction) + if [ "$direc" == "in" ]; then echo "out" > direction fi - data=`cat value` + data=$(cat value) if [ "$data" == "1" ]; then echo 0 > value fi @@ -65,17 +65,18 @@ echo "Bios upgrade started at $(date)" echo "Power off host server" $POWER_CMD off sleep 15 -if [ $($POWER_CMD status) != "off" ]; +if [ "$($POWER_CMD status)" != "off" ]; then echo "Host server didn't power off" echo "Bios upgrade failed" - exit -1 + exit 1 fi echo "Host server powered off" #Set ME to recovery mode echo "Set ME to recovery mode" -busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RECOVER +# shellcheck disable=SC2086 +busctl call "$IPMB_OBJ" "$IPMB_PATH" "$IPMB_INTF" $IPMB_CALL $ME_CMD_RECOVER sleep 5 #Flip GPIO to access SPI flash used by host. @@ -93,11 +94,10 @@ then echo "Bios image is $IMAGE_FILE" for d in mtd6 mtd7 ; do if [ -e "/dev/$d" ]; then - mtd=`cat /sys/class/mtd/$d/name` - if [ $mtd == "pnor" ]; then + mtd=$(cat /sys/class/mtd/$d/name) + if [ "$mtd" == "pnor" ]; then echo "Flashing bios image to $d..." - flashcp -v $IMAGE_FILE /dev/$d - if [ $? -eq 0 ]; then + if flashcp -v "$IMAGE_FILE" /dev/$d; then echo "bios updated successfully..." else echo "bios update failed..." @@ -125,7 +125,8 @@ sleep 5 #Reset ME to boot from new bios echo "Reset ME to boot from new bios" -busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RESET +# shellcheck disable=SC2086 +busctl call "$IPMB_OBJ" "$IPMB_PATH" "$IPMB_INTF" $IPMB_CALL $ME_CMD_RESET sleep 10 #Power on server @@ -134,7 +135,7 @@ $POWER_CMD on sleep 5 # Retry to power on once again if server didn't powered on -if [ $($POWER_CMD status) != "on" ]; +if [ "$($POWER_CMD status)" != "on" ]; then sleep 5 echo "Powering on server again" diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest index c841b6528..b9802a3ad 100755 --- a/meta-phosphor/scripts/run-repotest +++ b/meta-phosphor/scripts/run-repotest @@ -96,9 +96,6 @@ meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr/mac-check meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.sh -meta-facebook/recipes-fb/fb-powerctrl/files/power-util -meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh -meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh -- cgit v1.2.3 From 5a5f33c729e6b5869362172b63595422eb84a418 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 3 Nov 2021 10:35:37 -0500 Subject: Partially revert "treewide: remove obmc-system-mgmt feature" The obmc-system-mgmt feature is currently used in the image to trigger inclusion of a virtual-provider which provides a number of packages many systems need. Partially revert the removal of this feature so that the outcome is: 1. The empty obmc-phosphor-sysd package is still removed. 2. By default the 'obmc-system-mgmt' feature is included, unless specifically exempted. 3. All EVB platforms remove the 'obmc-system-mgmt' feature since they have no system they are managing. This partially reverts commit 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526. Tested: * Built `bletchley` and confirmed `packagegroup-fb-apps-system` and `entity-manager` are present. ``` entity-manager armv7ahf-vfpv4d16 0.1+git0+6bf41588ab-r0 packagegroup-fb-apps-system all 1.0-r1 ``` * Built `witherspoon` and confirmed `packagegroup-op-apps-system` and `pdbg` are present. ``` packagegroup-op-apps-system noarch 1.0 pdbg arm1176jzs 3.3 ``` * Ran `bitbake -p` on `evb-ast2600` to confirm the undefined `virtual-obmc-system-mgmt` is not being included in the image. Change-Id: I8b7804d5101cc84a2c57473b3f85672bf7767c67 Signed-off-by: Patrick Williams --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 + meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb | 2 ++ .../meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb | 2 ++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + meta-aspeed/conf/machine/evb-ast2500.conf | 1 + meta-aspeed/conf/machine/evb-ast2600.conf | 1 + meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 + .../recipes-asrock/packagegroups/packagegroup-asrock-apps.bb | 2 ++ meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 + .../recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb | 2 ++ meta-evb/meta-evb-raspberrypi/conf/local.conf.sample | 1 + meta-facebook/conf/machine/include/facebook.inc | 1 + meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb | 2 ++ meta-fii/meta-kudo/conf/machine/kudo.conf | 1 + meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 2 ++ meta-hpe/conf/machine/include/hpe.inc | 1 + .../meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb | 2 ++ meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 1 + .../recipes-inspur/packagegroups/packagegroup-inspur-apps.bb | 2 ++ meta-intel-openbmc/conf/machine/include/intel.inc | 1 + .../meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb | 2 ++ meta-inventec/conf/machine/include/inventec.inc | 1 + .../recipes-inventec/packagegroups/packagegroup-inventec-apps.bb | 2 ++ meta-nuvoton/conf/machine/evb-npcm750.conf | 1 + meta-openpower/conf/machine/include/openpower.inc | 1 + meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb | 2 ++ meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 ++ meta-phosphor/conf/distro/include/phosphor-base.inc | 1 + meta-phosphor/conf/machine/include/obmc-evb-common.inc | 2 ++ meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 1 + meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 + meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 + meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf | 1 + .../packagegroups/packagegroup-olympus-nuvoton-apps.bb | 2 ++ meta-supermicro/conf/machine/include/supermicro.inc | 1 + .../recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb | 2 ++ 36 files changed, 51 insertions(+) create mode 100644 meta-phosphor/conf/machine/include/obmc-evb-common.inc (limited to 'meta-facebook') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index cc9f95673..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,6 +31,7 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 758e5b3ca..06938055c 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index ac820590f..ede8d9db5 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -13,9 +13,11 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index bd82e61c5..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,6 +38,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf index e8aebd18f..1ee80f8be 100644 --- a/meta-aspeed/conf/machine/evb-ast2500.conf +++ b/meta-aspeed/conf/machine/evb-ast2500.conf @@ -2,5 +2,6 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb" UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index d3ee47b9c..e0aa2cdce 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -4,6 +4,7 @@ UBOOT_DEVICETREE = "ast2600a1-evb" SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index b960c743d..38fb811ff 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,6 +9,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index c3af264a3..e9f676dc8 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,8 +10,10 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 6e89d146d..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 0de1880bc..173805635 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample index 88b639111..b46503e67 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample @@ -20,3 +20,4 @@ CONF_VERSION = "2" # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 415816db8..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index febd160af..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,10 +18,12 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 534df3581..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,6 +30,7 @@ MACHINE_FEATURES += " \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" +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" 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 e916c0f5f..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 @@ -12,9 +12,11 @@ PACKAGES = " \ " 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" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 79896c713..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 9fdcd4b2e..3f16d41e7 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 6017a8885..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,6 +7,7 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 2d95e2332..68a2184cf 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 4287ddd80..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 69a523475..303a04b3d 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 0f8419e42..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,6 +17,7 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 374b279a9..7996cda5b 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,11 +15,13 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf index 74f70adbc..f0216eada 100644 --- a/meta-nuvoton/conf/machine/evb-npcm750.conf +++ b/meta-nuvoton/conf/machine/evb-npcm750.conf @@ -8,5 +8,6 @@ FLASH_SIZE = "32768" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc IMAGE_FSTYPES = "cpio.${INITRAMFS_CTYPE}.u-boot mtd-static" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 348361e87..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index e20def697..890967f96 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 572ec80f1..80c16d22e 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,6 +27,7 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management +# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -58,6 +59,7 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" +FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 0e7e84945..64f293cf0 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,6 +91,7 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc new file mode 100644 index 000000000..34d52505f --- /dev/null +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -0,0 +1,2 @@ +# EVBs don't have a managed system, so remove the feature. +IMAGE_FEATURES:remove = "obmc-system-mgmt" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 85b7f0448..494b06c7c 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,6 +29,7 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ + obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 4a65c5dcb..8fb72f286 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,6 +49,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 8b9a1f823..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,6 +44,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index b45d74591..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,5 +29,6 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index 6d69400e9..d462d6905 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index c8a762f77..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 6a24fadc6..4549bf70f 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From 8376db433f73a311d5d6acdaefb3a6cfcd034560 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 5 Nov 2021 09:26:48 -0500 Subject: meta-facebook: revamp OVERRIDES Ensure OVERRIDES are specific, MACHINE or DISTRO, rather than extending the primary OVERRIDES variable. Fix the order so that the variables are ordered from least-specific to most-specific since bitbake applies overrides in increasing order. This makes it so that 'fb-withhost' is applied before 'fb-compute-multihost' is applied before 'yosemitev2'. Thus, if a recipe has a specialization for 'yosemitev2' it is used rather than the weaker specialization for 'fb-withhost'. Tested by checking the OVERRIDES and MACHINEOVERRIDES for Bletchley, Tiogapass, and Yosemitev2 to verify they look correct. ``` MACHINEOVERRIDES="armv7a:aspeed:aspeed-g6:fb-nohost:bletchley" MACHINEOVERRIDES="armv6:aspeed:aspeed-g5:fb-withhost:fb-compute:fb-compute-singlehost:tiogapass" MACHINEOVERRIDES="armv6:aspeed:aspeed-g5:fb-withhost:fb-compute:fb-compute-multihost:yosemitev2" ``` Signed-off-by: Patrick Williams Change-Id: Id5fa38de29c748e4ceafd5ef5c831b4f6434ea01 --- meta-facebook/conf/machine/include/facebook-compute-multihost.inc | 4 ++-- meta-facebook/conf/machine/include/facebook-compute-singlehost.inc | 4 ++-- meta-facebook/conf/machine/include/facebook-compute.inc | 4 ++-- meta-facebook/conf/machine/include/facebook-nohost.inc | 4 ++-- meta-facebook/conf/machine/include/facebook-withhost.inc | 3 ++- meta-facebook/conf/machine/include/facebook.inc | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'meta-facebook') diff --git a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc index f472cfa47..e668d4bf9 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-multihost:" -OVERRIDES .= ":fb-compute-multihost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc index f6a868329..7b642c3c5 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-singlehost:" -OVERRIDES .= ":fb-compute-singlehost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc index 7d61f81e1..748a1feb4 100644 --- a/meta-facebook/conf/machine/include/facebook-compute.inc +++ b/meta-facebook/conf/machine/include/facebook-compute.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-withhost.inc +MACHINEOVERRIDES =. "fb-compute:" -OVERRIDES .= ":fb-compute" +require conf/machine/include/facebook-withhost.inc diff --git a/meta-facebook/conf/machine/include/facebook-nohost.inc b/meta-facebook/conf/machine/include/facebook-nohost.inc index e9af8e94d..a98da9979 100644 --- a/meta-facebook/conf/machine/include/facebook-nohost.inc +++ b/meta-facebook/conf/machine/include/facebook-nohost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook.inc +MACHINEOVERRIDES =. "fb-nohost:" -OVERRIDES .= ":fb-nohost" +require conf/machine/include/facebook.inc diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index 8567f696c..861d35f86 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,3 +1,5 @@ +MACHINEOVERRIDES =. "fb-withhost:" + require conf/machine/include/facebook.inc MACHINE_FEATURES += "\ @@ -12,4 +14,3 @@ VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 43a0c2222..4951a60cf 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,3 +1,5 @@ +DISTROOVERRIDES .= ":facebook" + MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ @@ -14,4 +16,3 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" -OVERRIDES .= ":facebook" -- cgit v1.2.3 From e493792ecd6710f821e505facc1fe3e24f765979 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 5 Nov 2021 10:04:42 -0500 Subject: meta-facebook: simplify SERIAL_CONSOLES The majority of our hardware uses ttyS4 and 57600. Rather than have each machine specify this, put it into a generic "facebook" override as the default for all our machines. Assuming OVERRIDES is set correctly, machines can still make specific overrides as alternatives. Signed-off-by: Patrick Williams Change-Id: Id8b704163dc57d94e27481dba7aef1bdf66aeee5 --- meta-facebook/conf/machine/include/facebook.inc | 2 ++ meta-facebook/meta-bletchley/conf/machine/bletchley.conf | 2 -- meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf | 2 -- meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'meta-facebook') diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 4951a60cf..47b641dfc 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -16,3 +16,5 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" +# Most of our hardware uses the default ttyS4 but at 57600. +SERIAL_CONSOLES:facebook = "57600;ttyS4" diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index 03af91001..9427df28a 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -11,6 +11,4 @@ require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/facebook-tpm2.inc -SERIAL_CONSOLES = "57600;ttyS4" - FLASH_SIZE = "131072" diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index 1e6ee084b..fce4b93f2 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -7,7 +7,5 @@ require conf/machine/include/facebook-compute-singlehost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -SERIAL_CONSOLES = "57600;ttyS4" - PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index d246cc9b3..f57383b8c 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -7,8 +7,6 @@ require conf/machine/include/facebook-compute-multihost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -SERIAL_CONSOLES = "57600;ttyS4" - PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" OBMC_HOST_INSTANCES = "1 2 3 4" -- cgit v1.2.3 From 300b5b5e030778dffea793808b7220d495a3f764 Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj Date: Wed, 17 Nov 2021 19:06:56 +0530 Subject: meta-facebook:Added timezone support. Changed the default timezone as PST, minimal core-region timezone files are installed. TESTED: Tested and verified in YosemiteV2 Signed-off-by: Logananth Sundararaj Change-Id: Ia05987c5c68c831aab5b4ae3bd953a03f368cf89 --- meta-facebook/recipes-extended/timezone/tzdata.bbappend | 3 +++ meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb | 1 + 2 files changed, 4 insertions(+) create mode 100644 meta-facebook/recipes-extended/timezone/tzdata.bbappend (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-extended/timezone/tzdata.bbappend b/meta-facebook/recipes-extended/timezone/tzdata.bbappend new file mode 100644 index 000000000..9e6694239 --- /dev/null +++ b/meta-facebook/recipes-extended/timezone/tzdata.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +DEFAULT_TIMEZONE = "PST8PDT" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..4b8704321 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -53,6 +53,7 @@ RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + tzdata-core \ " SUMMARY:${PN}-system = "Facebook System" -- cgit v1.2.3