From 7b2cd1b4d2e6572cf8d3d36f9f092e8250cfaaba Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 1 Jul 2021 12:48:03 +0800 Subject: 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 Change-Id: Ic56cb146987881e5b6312057ca412427f1d1ba29 --- meta-quanta/meta-gbs/conf/machine/gbs.conf | 47 +++++++++++++--------- .../images/obmc-phosphor-image.bbappend | 19 ++++++++- .../packagegroups/packagegroup-gbs-apps.bb | 36 ----------------- .../packagegroups/packagegroup-obmc-apps%.bbappend | 2 - 4 files changed, 47 insertions(+), 57 deletions(-) delete mode 100644 meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-gbs-apps.bb delete mode 100644 meta-quanta/meta-gbs/recipes-phosphor/packagegroups/packagegroup-obmc-apps%.bbappend (limited to 'meta-quanta') diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 6f54e383b..a709dfd27 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -19,29 +19,40 @@ FLASH_ROFS_OFFSET = "7168" FLASH_RWFS_OFFSET = "62400" FLASH_SIZE = "65536" -OBMC_MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " - -VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" -VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" -VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" - -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gbs-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gbs-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-gbs-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "gbmc-kcs-config" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "gbs-led-manager-config-native" PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update" # Remove unneeded binaries from image +IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt" +IMAGE_FEATURES_remove = "obmc-bmcweb" +IMAGE_FEATURES_remove = "obmc-chassis-mgmt" +IMAGE_FEATURES_remove = "obmc-chassis-state-mgmt" +IMAGE_FEATURES_remove = "obmc-console" +IMAGE_FEATURES_remove = "obmc-dbus-monitor" +IMAGE_FEATURES_remove = "obmc-devtools" IMAGE_FEATURES_remove = "obmc-fan-control" +IMAGE_FEATURES_remove = "obmc-fan-mgmt" +IMAGE_FEATURES_remove = "obmc-flash-mgmt" +IMAGE_FEATURES_remove = "obmc-fru-ipmi" +IMAGE_FEATURES_remove = "obmc-health-monitor" +IMAGE_FEATURES_remove = "obmc-host-ctl" +IMAGE_FEATURES_remove = "obmc-host-ipmi" +IMAGE_FEATURES_remove = "obmc-host-state-mgmt" +IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES_remove = "obmc-inventory" +IMAGE_FEATURES_remove = "obmc-leds" +IMAGE_FEATURES_remove = "obmc-logging-mgmt" +IMAGE_FEATURES_remove = "obmc-remote-logging-mgmt" +IMAGE_FEATURES_remove = "obmc-rng" +IMAGE_FEATURES_remove = "obmc-net-ipmi" +IMAGE_FEATURES_remove = "obmc-sensors" IMAGE_FEATURES_remove = "obmc-software" +IMAGE_FEATURES_remove = "obmc-system-mgmt" +IMAGE_FEATURES_remove = "obmc-telemetry" IMAGE_FEATURES_remove = "obmc-debug-collector" -IMAGE_FEATURES_remove = "obmc-net-ipmi" +IMAGE_FEATURES_remove = "obmc-settings-mgmt" +IMAGE_FEATURES_remove = "obmc-network-mgmt" +IMAGE_FEATURES_remove = "obmc-user-mgmt" +IMAGE_FEATURES_remove = "obmc-user-mgmt-ldap" +OBMC_IMAGE_BASE_INSTALL_remove = "packagegroup-obmc-apps-extras" 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" -- cgit v1.2.3