diff options
Diffstat (limited to 'meta-quanta/meta-gbs/recipes-phosphor')
3 files changed, 18 insertions, 39 deletions
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 1977c3b21..effbcc14f 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 = " usb-network" 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" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-gbs-apps.bb b/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-gbs-apps.bb deleted file mode 100644 index 20c81ad94..000000000 --- a/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-gbs-apps.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "OpenBMC for GBS system - Applications" -PR = "r1" - -inherit packagegroup - -PROVIDES = "${PACKAGES}" -PACKAGES = " \ - ${PN}-chassis \ - ${PN}-fans \ - ${PN}-flash \ - " - -PROVIDES += "virtual/obmc-chassis-mgmt" -PROVIDES += "virtual/obmc-fan-mgmt" -PROVIDES += "virtual/obmc-flash-mgmt" - -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" - -SUMMARY_${PN}-chassis = "GBS Chassis" -RDEPENDS_${PN}-chassis = " \ - x86-power-control \ - " - -SUMMARY_${PN}-fans = "GBS Fans" -RDEPENDS_${PN}-fans = " \ - phosphor-pid-control \ - " - -SUMMARY_${PN}-flash = "GBS Flash" -RDEPENDS_${PN}-flash = " \ - phosphor-ipmi-flash \ - gbs-bmc-update \ - virtual/bios-update \ - " diff --git a/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-obmc-apps%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-obmc-apps%.bbappend deleted file mode 100644 index 73e9b0aa4..000000000 --- a/meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-obmc-apps%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RDEPENDS_${PN}-fru-ipmi_remove_gbs = "fru-device" -RDEPENDS_${PN}-ikvm_remove_gbs = "obmc-ikvm" |