From 22dc1c712b37e90849be3a36e8b6b1787bd10ce6 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 2 Sep 2021 18:34:54 +0000
Subject: round-robin.sh: Remove obsolete workarounds

Change-Id: I3499fe1da24dded5e0d1621d3cba0a70014221f5
---
 round-robin.sh | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/round-robin.sh b/round-robin.sh
index 062204fb..b31132f0 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -385,21 +385,6 @@ build_abe ()
     PATH=$(pwd)/bin:$PATH
     export PATH
 
-    if [ x"$component" != x"stage2" ]; then
-	# TODO: Fix install_sysroot logic in ABE.
-	# ABE tries to install sysroot even for partial builds, e.g.,
-	# with "--build binutils".  Workaround by patching ABE.
-	sed -i -e "s/do_install_sysroot/:/" lib/control.sh
-    else
-	git checkout -- lib/control.sh
-    fi
-
-    if true; then
-	# WORKAROUND abe patches being blocked on proper testing.
-	# Append, not overwrite runtestflags in abe.sh
-	sed -i -e 's/override_runtestflags=.*/override_runtestflags="$override_runtestflags $setting"/' abe.sh
-    fi
-
     ccache -z
     local target_opt=""
     if [ x"${rr[target]}" != x"native" ]; then
-- 
cgit v1.2.3