| commit | 569cde226985532f06532904f20d508802fb8d78 | [log] [tgz] |
|---|---|---|
| author | Joel Stanley <joel@jms.id.au> | Thu Feb 27 17:02:10 2020 +1030 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Mon Apr 27 21:31:28 2020 -0500 |
| tree | 8dd47ca71d08b9276a34c39c14d0d76461c1484d | |
| parent | a151a218d1a6978c9a86ca6d52d6d0ed9db14da1 [diff] |
meta-zaius: Remove mention of vcs-workaround This was a P9 DD1 workaround. These systems are no longer supported and are not found in the wild, so the workaround has been retired. Zaius opted to use it's own application for vcs control. We can now add that directly instead of overriding vcs workaround with vcs control. (From meta-ingrasys rev: 721db18e94f400a0b81d4a92ad2336be76fe1a6d) Signed-off-by: Joel Stanley <joel@jms.id.au> Change-Id: I4e9b26e5791a9b1dc8a5de343e52d5859154330a Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 38713cd..26595fa 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
@@ -5,8 +5,6 @@ FLASH_SIZE = "65536" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ingrasys.inc
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 597dff4..3ab36b1 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
@@ -6,9 +6,6 @@ inherit obmc-phosphor-systemd -PROVIDES += 'virtual/p9-vcs-workaround' -RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' - TMPL_OFF = "vcs-off@.service" TMPL_ON = "vcs-on@.service" INSTFMT_OFF = "vcs-off@{0}.service"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend index 23cdb8d..42f7117 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
@@ -1 +1 @@ -RDEPENDS_${PN}_append_zaius = ' avsbus-control' +RDEPENDS_${PN}_append_zaius = ' avsbus-control vcs-control'