diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-09-06 23:25:16 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-09-14 21:20:55 -0400 |
commit | a6bd1e9970ed5f98a0cdbc8deac8d9ed69234349 (patch) | |
tree | e305231ac3782812bfeecdf43c352463d5c0674c /meta-openbmc-machines | |
parent | caf3718d94ff973b4f034eb46f5afc528ae30d79 (diff) | |
download | talos-openbmc-a6bd1e9970ed5f98a0cdbc8deac8d9ed69234349.tar.gz talos-openbmc-a6bd1e9970ed5f98a0cdbc8deac8d9ed69234349.zip |
Move and rename skeleton recipe
Move the skeleton recipe to the openpower layer and rename
it more appropriately to packagegroup-op-apps.
Change-Id: I27bad03013fd7e5381cb535a5de4f8821674d663
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines')
5 files changed, 75 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb new file mode 100644 index 000000000..268caf5ba --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -0,0 +1,67 @@ +SUMMARY = "OpenBMC for OpenPOWER - Applications" +PR = "r1" + +inherit packagegroup +inherit obmc-phosphor-license + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-sensors \ + ${PN}-chassis \ + ${PN}-fans \ + ${PN}-flash \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-sensor-mgmt" +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES_${PN}-sensors += "virtual-obmc-sensor-mgmt" +RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-sensors = "OpenPOWER Sensors" +RDEPENDS_${PN}-sensors = " \ + obmc-hwmon \ + obmc-mgr-sensor \ + " + +SUMMARY_${PN}-chassis = "OpenPOWER Chassis" +RDEPENDS_${PN}-chassis = " \ + obmc-button-power \ + obmc-button-reset \ + obmc-control-chassis \ + obmc-hostcheckstop \ + obmc-mgr-inventory \ + obmc-op-control-power \ + obmc-pcie-detect \ + obmc-watchdog \ + obmc-op-control-host \ + obmc-control-led \ + " + +SUMMARY_${PN}-sensors = "OpenPOWER Fans" +RDEPENDS_${PN}-fans = " \ + obmc-hwmon \ + obmc-control-fan \ + " + +SUMMARY_${PN}-flash = "OpenPOWER Flash" +RDEPENDS_${PN}-flash = " \ + obmc-flash-bios \ + obmc-flash-bmc \ + obmc-mgr-download \ + obmc-op-flasher \ + obmc-control-bmc \ + " + +SUMMARY_${PN}-system = "OpenPOWER System" +RDEPENDS_${PN}-system = " \ + obmc-mgr-system \ + obmc-mgr-state \ + " diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend new file mode 100644 index 000000000..fb360507f --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}-extrasdev += "obmc-pydevtools" diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index 4e79587c1..d70cbe638 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -10,8 +10,8 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "btbridged" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend new file mode 100644 index 000000000..c0b52cf48 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend @@ -0,0 +1,2 @@ +RDEPENDS_${PN}-chassis_remove += "obmc-button-reset" +RDEPENDS_${PN}-fans_remove += "obmc-control-fan" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend deleted file mode 100644 index 27784e0ab..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RDEPENDS_skeleton_remove += "obmc-control-fan" -RDEPENDS_skeleton_remove += "obmc-button-reset" |