meta-quanta: gbs: remove packagegroup-obmc/gbs-apps settings
remove packagegroup-obmc-apps-extras/packagegroup-gbs-apps
and add all the needed binaries to obmc-phosphor-image.bbappend
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: Ic56cb146987881e5b6312057ca412427f1d1ba29
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 1977c3b..effbcc1 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -17,7 +17,24 @@
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-image-signing"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " openssl-bin"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-ipmi-blobs-binarystore"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " read-margin-temp"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-virtual-sensor"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " acpi-power-state-daemon"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/obmc-gpio-presence"
+
+# Add back packages that were part of packagegroup-obmc-apps-extras
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-hwmon"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-inventory-manager"
+# Required for obmc-bmcweb
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " bmcweb"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-bmcweb-cert-config"
+# Required for LEDs. Part of obmc-leds
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+# Required for the front port. Part of obmc-console
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " obmc-console"
+# Required from packagegroup-gbs-apps
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-bmc-update"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/bios-update"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " x86-power-control"
+OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-pid-control"