diff options
author | Hieu Huynh <hieuh@os.amperecomputing.com> | 2023-11-09 14:09:36 +0300 |
---|---|---|
committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-11-11 11:14:40 +0300 |
commit | feeda1fe83be29488f7d25b7fef7926e766c5496 (patch) | |
tree | 6b7569263b1039c0bf76eb743adb5c242e80e209 | |
parent | 514f4d748426aed037c34c419fcfcd9fb0512142 (diff) | |
download | openbmc-feeda1fe83be29488f7d25b7fef7926e766c5496.tar.xz |
meta-ampere: move packagegroup to common
This moves packagegroup to common to be used for all platforms.
Tested:
- All packages are available on RootFs
- ipmi sensor, fru report
- Web login
- Power control
Signed-off-by: Hieu Huynh <hieuh@os.amperecomputing.com>
Change-Id: I87f7ddbd94e9321e452353ed21cacd0f8a4d8f74
-rw-r--r-- | meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-ampere-apps.bb (renamed from meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb) | 18 | ||||
-rw-r--r-- | meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend (renamed from meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend) | 11 | ||||
-rw-r--r-- | meta-ampere/meta-jade/conf/machine/mtjade.conf | 10 | ||||
-rw-r--r-- | meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf | 16 | ||||
-rw-r--r-- | meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb | 42 | ||||
-rw-r--r-- | meta-ampere/meta-mitchell/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 14 |
6 files changed, 22 insertions, 89 deletions
diff --git a/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-ampere-apps.bb index f1a1bbede4..82f0dfa5d4 100644 --- a/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-ampere-apps.bb @@ -24,26 +24,24 @@ RPROVIDES:${PN}-fans += "virtual-obmc-fan-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 \ - ac01-boot-progress \ + ampere-platform-init \ + ampere-utils \ + ampere-usbnet \ + ampere-ipmi-oem \ + ampere-mac-update \ + ampere-driver-binder \ phosphor-post-code-manager \ phosphor-host-postd \ " SUMMARY:${PN}-system = "Ampere System" RDEPENDS:${PN}-system = " \ - smbios-mdr \ + ampere-hostctrl \ + ampere-fault-monitor \ " SUMMARY:${PN}-flash = "Ampere Flash" RDEPENDS:${PN}-flash = " \ - phosphor-software-manager \ " SUMMARY:${PN}-fans = "Ampere Fans" diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 734d42f95f..e81e3bf29e 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -3,6 +3,16 @@ RDEPENDS:${PN}-extras:append = " \ phosphor-virtual-sensor \ phosphor-misc-usb-ctrl \ phosphor-gpio-monitor-monitor \ + phosphor-skeleton-control-power \ + phosphor-hostlogger \ + phosphor-sel-logger \ + phosphor-logging \ + phosphor-post-code-manager \ + phosphor-host-postd \ + phosphor-software-manager \ + obmc-phosphor-buttons-signals \ + obmc-phosphor-buttons-handler \ + smbios-mdr \ " RDEPENDS:${PN}-inventory:append = " \ @@ -12,4 +22,3 @@ RDEPENDS:${PN}-inventory:append = " \ RDEPENDS:${PN}-extras:remove = " phosphor-hwmon" VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" -RDEPENDS:${PN}-extras:append = " phosphor-virtual-sensor" diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 79f1ee6238..339e00b20e 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -24,16 +24,8 @@ MACHINE_FEATURES += "\ VOLATILE_LOG_DIR = "no" OBMC_IMAGE_EXTRA_INSTALL:append = "\ - ampere-utils \ - ampere-usbnet \ - ampere-mac-update \ mtjade-gpio-config \ - ampere-platform-init \ - ampere-ipmi-oem \ - phosphor-ipmi-blobs \ - phosphor-ipmi-blobs-binarystore \ - ampere-driver-binder \ - ampere-fault-monitor \ + ac01-boot-progress \ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" 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" |