From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Wed, 19 Oct 2022 14:24:46 +0000 (+0200)
Subject: phase1: remove unused 'cc_version'
X-Git-Tag: v2~66
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b654c8eae816b84a7d9ec6261a7ab4219ee67a75;p=buildbot.git

phase1: remove unused 'cc_version'

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---

diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index ccc7d31..ceeace4 100644
--- a/phase1/config.ini.example
+++ b/phase1/config.ini.example
@@ -10,7 +10,6 @@ status_user = example
 status_password = example
 expire = 1209600
 port = 9989
-cc_version = le 4.9
 git_ssh = true
 git_ssh_key = -----BEGIN RSA PRIVATE KEY-----
 	MIIEpAIBAAKCAQEAuCJwo6OmrRDxcGfsMgBhq0vdzp2ZIdqnedFH8u6tVYLt9WDU
diff --git a/phase1/master.cfg b/phase1/master.cfg
index be3c3fa..0c836d7 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -214,7 +214,6 @@ c['prioritizeBuilders'] = prioritizeBuilders
 work_dir = os.path.abspath(ini.get("general", "workdir") or ".")
 scripts_dir = os.path.abspath("../scripts")
 tree_expire = 0
-cc_version = None
 
 cc_command = "gcc"
 cxx_command = "g++"
@@ -227,11 +226,6 @@ git_ssh_key = None
 if ini.has_option("phase1", "expire"):
 	tree_expire = ini.getint("phase1", "expire")
 
-if ini.has_option("phase1", "cc_version"):
-	cc_version = ini.get("phase1", "cc_version").split()
-	if len(cc_version) == 1:
-		cc_version = ["eq", cc_version[0]]
-
 if ini.has_option("general", "git_ssh"):
 	git_ssh = ini.getboolean("general", "git_ssh")
 
@@ -715,9 +709,7 @@ for target in targets:
 		property = "cc_command",
 		description = "Finding gcc command",
 		command = [
-			"../findbin.pl", "gcc",
-			cc_version[0] if cc_version is not None else '',
-			cc_version[1] if cc_version is not None else ''
+			"../findbin.pl", "gcc", "", "",
 		],
 		haltOnFailure = True))
 
@@ -726,9 +718,7 @@ for target in targets:
 		property = "cxx_command",
 		description = "Finding g++ command",
 		command = [
-			"../findbin.pl", "g++",
-			cc_version[0] if cc_version is not None else '',
-			cc_version[1] if cc_version is not None else ''
+			"../findbin.pl", "g++", "", "",
 		],
 		haltOnFailure = True))