From e161514219e0dc8a957dabbb8529fb9fcac4e115 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 Apr 2020 14:06:02 -0400 Subject: meta-ibm: move all meta-witherspoon metadata The metadata common to all IBM systems is confusingly split between meta-ibm and meta-witherspoon. Move everything to meta-ibm. The meta-ibm README is re-written to more accurately reflect the scope of the layer. Allow the configuration samples (bblayers.conf.sample, local.conf.sample) to be sourced from either meta-ibm or meta-witherspoon until such a time that any workflows and tooling have had the opportunity to move to meta-ibm. (From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442) Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- .../packagegroups/packagegroup-obmc-apps.bbappend | 38 +++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend') diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 44f8028af..5c72bc4f5 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1,37 @@ -RDEPENDS_${PN}-logging += "ibm-logging" \ No newline at end of file +POWER_SERVICE_PACKAGES_AC_SERVER = " \ + phosphor-power-monitor \ + phosphor-power-systemd-links-monitor \ + phosphor-power-sequencer \ + phosphor-power-systemd-links-sequencer \ + phosphor-power-utils \ + phosphor-power \ +" + +POWER_SERVICE_PACKAGES_RAINIER = " \ + ${POWER_SERVICE_PACKAGES_AC_SERVER} \ + phosphor-power-regulators \ + phosphor-power-psu-monitor \ +" + +EXTRA_IBM_LOGGING_PKGS = "" +EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging" +EXTRA_IBM_LOGGING_PKGS_witherspoon-tacoma = "" +EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" + +RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" +RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" +RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" +RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" +RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" +RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" +RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" +RDEPENDS_${PN}-extras_append_rainier = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" + +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm openpower-hw-diags" + +${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" -- cgit v1.2.3