diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-11-05 16:50:44 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-11-10 21:11:44 +0300 |
| commit | d83b524fcf1bf3a0fa2851591e0abf845fbdeaa3 (patch) | |
| tree | d4ca392ee69e6c8195e2906f916536f8a02a24f4 | |
| parent | e26b18755304b74f817b79103ac2cce4dc277580 (diff) | |
| download | openbmc-d83b524fcf1bf3a0fa2851591e0abf845fbdeaa3.tar.xz | |
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
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 5 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-evb-common.inc | 6 |
2 files changed, 9 insertions, 2 deletions
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:" |