From dc60e49197ea25a446b73958d727dcf49bf9b3bb Mon Sep 17 00:00:00 2001 From: Vivekanand Veeracholan Date: Mon, 30 Aug 2021 23:21:17 -0700 Subject: meta-quanta: meta-gsj: Remove unneeded packages Remove the unneeded obmc packages and add specific ones that are used. Signed-off-by: Vivekanand Veeracholan Change-Id: I80472124ec1af684ebbd502219c8ae6d9f8fcee9 --- meta-quanta/meta-gsj/conf/machine/gsj.conf | 30 ++++++++++++++++++++++ .../images/obmc-phosphor-image.bbappend | 8 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index cef4e89d2..c5089e804 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -20,7 +20,37 @@ OBMC_MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ " # Remove unneeded binaries from image +IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt" +IMAGE_FEATURES:remove = "obmc-bmcweb" +IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" +IMAGE_FEATURES:remove = "obmc-chassis-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-sensors" +IMAGE_FEATURES:remove = "obmc-settings-mgmt" +IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-network-mgmt" +IMAGE_FEATURES:remove = "obmc-telemetry" +OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index dc75f60e6..655929695 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -5,4 +5,10 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " google-ipmi-sys" OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " gsj-hotswap-change-setting" OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " iperf3" -IMAGE_FEATURES:remove:gsj = "obmc-user-mgmt-ldap" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-ipmi-host" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-hwmon" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-inventory-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-manager}" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" -- cgit v1.2.3