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-phosphor/conf/machine/include/obmc-evb-common.inc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta-phosphor/conf/machine/include/obmc-evb-common.inc (limited to 'meta-phosphor/conf/machine/include') 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" -- cgit v1.2.3 From d83b524fcf1bf3a0fa2851591e0abf845fbdeaa3 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 5 Nov 2021 08:50:44 -0500 Subject: meta-phosphor: remove obmc-system-mgmt from qemu It was reported that after 5a5f33c729e6b5869362172b63595422eb84a418 the qemu images are not buildable. Treat qemu systems like an 'evb' so that the obmc-system-mgmt package is not included. Make a minor change to how evb is specified so that it is treated as a MACHINEOVERRIDE that can be leveraged in multiple recipes. Tested by ensuring that `evb-ast2600` still successfully resolves all package dependencies (with `bitbake -p`). Signed-off-by: Patrick Williams Change-Id: Iff4573aa3d4aac30a6681ed75741a6e351bda982 --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 5 +++++ meta-phosphor/conf/machine/include/obmc-evb-common.inc | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/conf/machine/include') diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 80c16d22e..4143f34eb 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -72,6 +72,11 @@ FEATURE_PACKAGES_obmc-user-mgmt-ldap ?= "packagegroup-obmc-apps-user-mgmt-ldap" # tree under phosphor-ipmi-host FEATURE_PACKAGES_obmc-net-ipmi:qemuall = "" +# EVB systems do not have a managed system. +FEATURE_PACKAGES_obmc-system-mgmt:phosphor-evb = "" +# QEMU systems are like EVBs and do not have a managed system. +FEATURE_PACKAGES_obmc-system-mgmt:qemuall = "" + # Add new packages to be installed to a package group in # packagegroup-obmc-apps, not here. OBMC_IMAGE_BASE_INSTALL = " \ diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc index 34d52505f..0d41a1b97 100644 --- a/meta-phosphor/conf/machine/include/obmc-evb-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -1,2 +1,4 @@ -# EVBs don't have a managed system, so remove the feature. -IMAGE_FEATURES:remove = "obmc-system-mgmt" +# EVB systems have different packages they can support, due to not having a +# managed host. Enable this machine override to allow other recipes to know +# that the machine is a special type. +MACHINEOVERRIDES =. "phosphor-evb:" -- cgit v1.2.3