summaryrefslogtreecommitdiff
path: root/meta-ampere/meta-mitchell
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ampere/meta-mitchell')
-rw-r--r--meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf16
-rw-r--r--meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb42
-rw-r--r--meta-ampere/meta-mitchell/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend14
3 files changed, 3 insertions, 69 deletions
diff --git a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
index 0c3f218682..db5ac7bc60 100644
--- a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
+++ b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
@@ -24,24 +24,14 @@ MACHINE_FEATURES += "\
"
OBMC_IMAGE_EXTRA_INSTALL:append = " \
- ampere-utils \
- ampere-usbnet \
- phosphor-misc-usb-ctrl \
- ampere-platform-init \
- ampere-ipmi-oem \
- ampere-hostctrl \
- ampere-driver-binder \
- ampere-mac-update \
- phosphor-gpio-monitor-monitor \
phosphor-ipmi-blobs \
phosphor-ipmi-blobs-binarystore \
util-linux \
- ampere-fault-monitor \
"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-obmc-ampere-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-obmc-ampere-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-obmc-ampere-apps"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps"
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ampere-led-manager-config-native"
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb b/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb
deleted file mode 100644
index 700252d069..0000000000
--- a/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "OpenBMC for Ampere - Applications"
-PR = "r1"
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
- ${PN}-chassis \
- ${PN}-flash \
- ${PN}-system \
- "
-
-PROVIDES += "virtual/obmc-chassis-mgmt"
-PROVIDES += "virtual/obmc-flash-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
-
-RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt"
-
-SUMMARY:${PN}-chassis = "Ampere Chassis"
-RDEPENDS:${PN}-chassis = " \
- obmc-phosphor-buttons-signals \
- obmc-phosphor-buttons-handler \
- phosphor-skeleton-control-power \
- ampere-hostctrl \
- phosphor-hostlogger \
- phosphor-sel-logger \
- phosphor-logging \
- phosphor-post-code-manager \
- phosphor-host-postd \
- "
-
-SUMMARY:${PN}-system = "Ampere System"
-RDEPENDS:${PN}-system = " \
- smbios-mdr \
- "
-
-SUMMARY:${PN}-flash = "Ampere Flash"
-RDEPENDS:${PN}-flash = " \
- phosphor-software-manager \
- "
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index c06b40ae3e..0000000000
--- a/meta-ampere/meta-mitchell/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-RDEPENDS:${PN}-extras:append = " \
- phosphor-image-signing \
- phosphor-virtual-sensor \
- phosphor-misc-usb-ctrl \
- "
-
-RDEPENDS:${PN}-inventory:append = " \
- dbus-sensors \
- entity-manager \
- "
-
-RDEPENDS:${PN}-extras:remove = " phosphor-hwmon"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
-RDEPENDS:${PN}-extras:append = " phosphor-virtual-sensor"