| commit | 25b36e246d74a9c324aa39e9ac19a1586309897f | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Fri Apr 07 14:21:33 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Wed Apr 12 21:27:58 2017 +0000 |
| tree | c71fe2346faff8a1b98650ab0d154b42db277f49 | |
| parent | 89bc5a1994576e08117fde868afb075867d897b1 [diff] |
Move FSI recipe and services to meta-openpower FSI is an OpenPower concept. Change-Id: I0043d6d7b4783179b0893bbf7995aa229df2463f Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb similarity index 100% rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi.bb rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
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 index b9d974c..cf8ce72 100644 --- 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
@@ -34,7 +34,7 @@ obmc-host-failure-reboots \ " #Pull in obmc-fsi on all P9 OpenPOWER systems -RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'obmc-fsi', 'obmc-fsi')}" +RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'op-fsi', 'op-fsi')}" SUMMARY_${PN}-fans = "OpenPOWER Fans" RDEPENDS_${PN}-fans = " \
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc index 0aa3035..a589623 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc
@@ -1,2 +1,2 @@ -OBMC_MACHINE_FEATURES += 'p9-vcs-workaround obmc-fsi' +OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start"