From 93f488fc37d6cd1f54eaf69385fe9011fe6d3c59 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Tue, 6 Jul 2021 03:53:58 +0200 Subject: [PATCH] scripts: handle gcc and linux in dl_cleanup script Handle gcc and linux with a special regex that set their progname with their major version. This way every minor version can be cleared. The build cleanup logic can be tweaked later to clean the entire toolchain and target dir with a different gcc version. Signed-off-by: Ansuel Smith [reformat commit message] Signed-off-by: Paul Spooren --- scripts/dl_cleanup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py index 3c26dc8eb5..ad1b88c8b9 100755 --- a/scripts/dl_cleanup.py +++ b/scripts/dl_cleanup.py @@ -109,6 +109,8 @@ extensions = ( ) versionRegex = ( + (re.compile(r"(gcc[-_]\d+)\.(\d+)\.(\d+)"), parseVer_12), # gcc.1.2 + (re.compile(r"(linux[-_]\d+\.\d+)\.(\d+)"), parseVer_r), # linux.1 (re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234), # xxx-1.2.3.4 ( re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)-"), @@ -123,8 +125,6 @@ versionRegex = ( ) blacklist = [ - ("linux", re.compile(r"linux-\d.*")), - ("gcc", re.compile(r"gcc-.*")), ("wl_apsta", re.compile(r"wl_apsta.*")), (".fw", re.compile(r".*\.fw")), (".arm", re.compile(r".*\.arm")),