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
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
similarity index 77%
rename from meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
rename to meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-ampere-apps.bb
index f1a1bbe..82f0dfa 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 @@
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-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
new file mode 100644
index 0000000..e81e3bf
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -0,0 +1,24 @@
+RDEPENDS:${PN}-extras:append = " \
+ phosphor-image-signing \
+ 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 = " \
+ dbus-sensors \
+ entity-manager \
+ "
+
+RDEPENDS:${PN}-extras:remove = " phosphor-hwmon"
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 79f1ee6..339e00b 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -24,16 +24,8 @@
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-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index 734d42f..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-RDEPENDS:${PN}-extras:append = " \
- phosphor-image-signing \
- phosphor-virtual-sensor \
- phosphor-misc-usb-ctrl \
- phosphor-gpio-monitor-monitor \
- "
-
-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"
diff --git a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
index 0c3f218..db5ac7b 100644
--- a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
+++ b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
@@ -24,24 +24,14 @@
"
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 700252d..0000000
--- 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 c06b40a..0000000
--- 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"