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-fii/meta-kudo/conf/machine/kudo.conf | 1 + meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 2 ++ 2 files changed, 3 insertions(+) (limited to 'meta-fii') diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 534df3581e..e065f2086c 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 e916c0f5fe..800efde74d 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" -- cgit v1.2.3