diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-11-03 18:35:37 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-11-04 12:36:33 +0300 |
| commit | 5a5f33c729e6b5869362172b63595422eb84a418 (patch) | |
| tree | e59a7c80674d5e569507b4f0e317d1710408e654 /meta-phosphor | |
| parent | 552e93e6ec8d72befcbe7ea59c3a57968f6603dc (diff) | |
| download | openbmc-5a5f33c729e6b5869362172b63595422eb84a418.tar.xz | |
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 <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor')
4 files changed, 6 insertions, 0 deletions
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)} \ |