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-quanta/meta-gbs/conf/machine/gbs.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-quanta/meta-gbs/conf') 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" -- 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-quanta/meta-gbs/conf') 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 ad394302e12d0b3ccb3179fc685a78273fa94e14 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 17 Nov 2021 15:24:17 -0800 Subject: meta-quanta: gbs: Add explicit layer dependencies We want the machine layer to be guaranteed to override our top-level layers. Change-Id: Ib071dad5b43c112d729bf7f85f36a9f6bd571b31 Signed-off-by: William A. Kennington III --- meta-quanta/meta-gbs/conf/layer.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-quanta/meta-gbs/conf') diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index 9f41e0501..cd2ca1d32 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" +LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer" -- cgit v1.2.3