diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-22 18:17:13 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-28 18:35:00 +0300 |
| commit | 6238143945126f6a7fc6c35f25e344d87aacdf8d (patch) | |
| tree | 83bed6a7250870d289837675f7c8a2eb4839f214 /meta-ibm/recipes-phosphor | |
| parent | 96bca606cce61cb34bbb9f214b77b18b21d6d6ca (diff) | |
| download | openbmc-6238143945126f6a7fc6c35f25e344d87aacdf8d.tar.xz | |
meta-ibm: utilize new webui IMAGE_FEATURE
Remove RDEPENDS usage to bring in the webui and move to the new
IMAGE_FEATURE
Tested:
- Confirmed system1 has webui
Change-Id: I942509a3b5db2de8caf693f81f78850afd90f58d
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
| -rw-r--r-- | meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index a82f62c55d..71c4c233b1 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -4,10 +4,12 @@ OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd" OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc-distributed = " etcd" IMAGE_FEATURES:append = " obmc-dbus-monitor" +IMAGE_FEATURES:append = " obmc-webui" # remove so things fit in available flash space IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove:witherspoon = "obmc-telemetry" +IMAGE_FEATURES:remove:witherspoon = "obmc-webui" # Generic IPMI FRU vpd collection not needed on p10bmc IMAGE_FEATURES:remove:p10bmc = "obmc-fru-ipmi" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index dfd5eea5d3..8b677e4e06 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -31,9 +31,9 @@ RDEPENDS:${PN}-inventory:append:witherspoon-tacoma = " entity-manager" RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog" RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor" RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync" -RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor" +RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} dbus-sensors phosphor-virtual-sensor" RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger libmctp" -RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" +RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" RDEPENDS:${PN}-extras:append:sbp1 = " phosphor-ipmi-ipmb " RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" |