diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-09-06 22:44:21 -0400 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-09-14 20:15:07 +0000 |
| commit | a242937d35e01bade057e5b66f27e6638b58ba2a (patch) | |
| tree | 00de8c7ca0ac0e019a16522fa540929fecd755e6 /meta-phosphor/classes/obmc-phosphor-image.bbclass | |
| parent | 4a74ec997e4877303a943630f33b7510dd3bb000 (diff) | |
| download | talos-openbmc-a242937d35e01bade057e5b66f27e6638b58ba2a.tar.gz talos-openbmc-a242937d35e01bade057e5b66f27e6638b58ba2a.zip | |
remove mgmt packagegroups
These packagegroups are an unnecessary level of indirection.
Prior, the image feature was implemented by a packagegroup. The
packagegroup was defined to pull in a virtual. The virtual could
then be either a single package or another packagegroup.
Just implement the feature with the virtual directly to avoid
nonsensical situations like:
feature <- pkggroup <- virtual <- pkggroup.
Change-Id: I055257b6b646c82764849d49fdad7c10263e3aa3
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/classes/obmc-phosphor-image.bbclass')
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 8d0ee9f95..d36777642 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -12,24 +12,25 @@ inherit core-image inherit obmc-phosphor-license +inherit obmc-phosphor-utils -FEATURE_PACKAGES_obmc-phosphor-fan-mgmt ?= "packagegroup-obmc-phosphor-apps-fan-mgmt" -FEATURE_PACKAGES_obmc-phosphor-chassis-mgmt ?= "packagegroup-obmc-phosphor-apps-chassis-mgmt" -FEATURE_PACKAGES_obmc-phosphor-sensor-mgmt ?= "packagegroup-obmc-phosphor-apps-sensor-mgmt" -FEATURE_PACKAGES_obmc-phosphor-flash-mgmt ?= "packagegroup-obmc-phosphor-apps-flash-mgmt" -FEATURE_PACKAGES_obmc-phosphor-event-mgmt ?= "packagegroup-obmc-phosphor-apps-event-mgmt" -FEATURE_PACKAGES_obmc-phosphor-user-mgmt ?= "packagegroup-obmc-phosphor-apps-user-mgmt" -FEATURE_PACKAGES_obmc-phosphor-system-mgmt ?= "packagegroup-obmc-phosphor-apps-system-mgmt" +FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@cf_enabled('obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', d)}" +FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@cf_enabled('obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt', d)}" +FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled('obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt', d)}" +FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', d)}" +FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled('obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt', d)}" +FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}" +FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}" # Install entire Phosphor application stack by default IMAGE_FEATURES += " \ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-sensor-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-phosphor-event-mgmt \ - obmc-phosphor-user-mgmt \ - obmc-phosphor-system-mgmt \ + obmc-fan-mgmt \ + obmc-chassis-mgmt \ + obmc-sensor-mgmt \ + obmc-flash-mgmt \ + obmc-event-mgmt \ + obmc-user-mgmt \ + obmc-system-mgmt \ ssh-server-dropbear \ " |
