ELBERT: revert to zeus (#188)

Summary: Reverting Elbert build to zeus to unblock networking hang during primary boot issue that we've been seeing with the latest image. Elbert build passes. Ran automated tests over the weekend and did not see the networking hang issue hit. We are able to reproduce with lf-dunfell. Pull Request resolved: facebookexternal/openbmc.arista#188 Reviewed By: binhuang00 fbshipit-source-id: 1741c81422
facebook · Aug 9, 2021 · ed6b35e · ed6b35e
1 parent 660d801
commit ed6b35e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/meta-delta/meta-agc032a/recipes-agc032a/aggregate-sensor/libaggregate-sensor_0.1.bbappend b/meta-delta/meta-agc032a/recipes-agc032a/aggregate-sensor/libaggregate-sensor_0.1.bbappend
@@ -1,4 +1,4 @@
-<<<<<<< 5d971f3327e5673b20d8d11bfe67f4331ffe7a63
+
 # Copyright 2014-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it

diff --git a/openbmc-init-build-env b/openbmc-init-build-env
@@ -34,7 +34,6 @@ PLAT_DISTRO_OVERRIDES=(
   meta-elbert:zeus
   meta-fby35:zeus
   meta-grandcanyon:zeus
-  meta-agc032a:zeus
 # Legacy platforms pending kernel upgrade
   meta-fby2-gpv2:rocko
   meta-fby2:rocko