From 41ffc9063331730045879e25fc56ef1d781cddec Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Wed, 12 Oct 2022 17:20:01 +0200 Subject: [PATCH] cleanup(scripts): allow falco-driver-loader script to manage more gcc versions. AmazonLinux uses `gcc-$Vers`, like gcc-10, but our regex prevented that to work. Instead, rely on the fact that **real** gcc has some `--version` fixed output. Signed-off-by: Federico Di Pierro --- scripts/falco-driver-loader | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/falco-driver-loader b/scripts/falco-driver-loader index 1283cc2a..adf183b4 100755 --- a/scripts/falco-driver-loader +++ b/scripts/falco-driver-loader @@ -214,7 +214,14 @@ load_kernel_module_compile() { fi # Try to compile using all the available gcc versions - for CURRENT_GCC in $(which gcc) $(ls "$(dirname "$(which gcc)")"/gcc-* | grep 'gcc-[0-9]\+' | sort -n -r -k 2 -t -); do + for CURRENT_GCC in $(ls "$(dirname "$(which gcc)")"/gcc*); do + # Filter away gcc-{ar,nm,...} + # first line of gcc --version output is always like: + # "gcc (GCC) 12.2.0" + ${CURRENT_GCC} --version 2>&1 | grep GCC + if [ "$?" -ne "0" ]; then + continue + fi echo "* Trying to dkms install ${DRIVER_NAME} module with GCC ${CURRENT_GCC}" echo "#!/usr/bin/env bash" > /tmp/falco-dkms-make echo "make CC=${CURRENT_GCC} \$@" >> /tmp/falco-dkms-make