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 <patrick@stwcx.xyz>
Change-Id: Iff4573aa3d4aac30a6681ed75741a6e351bda982
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 80c16d2..4143f34 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -72,6 +72,11 @@
# 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 34d5250..0d41a1b 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:"