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>
diff --git a/meta-ibm/meta-genesis3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-genesis3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 897b488..82842e9 100644
--- a/meta-ibm/meta-genesis3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-genesis3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -8,7 +8,6 @@
RDEPENDS:${PN}-devtools:append = " \
entity-manager \
- webui-vue \
ldd \
ethtool \
net-tools \
@@ -47,4 +46,4 @@
SUMMARY:${PN}-fans = "IBM Fans"
RDEPENDS:${PN}-fans = " \
phosphor-pid-control \
- "
\ No newline at end of file
+ "
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 7fd82a1..b0f4e15 100644
--- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1 +1 @@
-RDEPENDS:${PN}-inventory:append:palmetto = " openpower-occ-control webui-vue"
+RDEPENDS:${PN}-inventory:append:palmetto = " openpower-occ-control"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 8c1ac67..f1b7903 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,2 +1,2 @@
RDEPENDS:${PN}-inventory:append:romulus = " openpower-occ-control id-button"
-RDEPENDS:${PN}-extras:append:romulus = " webui-vue phosphor-image-signing"
+RDEPENDS:${PN}-extras:append:romulus = " phosphor-image-signing"
diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-sbp1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 763ae64..9bcb719 100644
--- a/meta-ibm/meta-sbp1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-sbp1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -8,7 +8,6 @@
RDEPENDS:${PN}-devtools:append = " \
entity-manager \
- webui-vue \
ethtool \
net-tools \
lmsensors-sensors \
diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
index a82f62c..71c4c23 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-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 dfd5eea..8b677e4 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}-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"