From c381e2e5dac7edd66989800862cffed6e7cf8a67 Mon Sep 17 00:00:00 2001 From: Manu Bretelle Date: Tue, 20 Aug 2024 21:13:52 -0700 Subject: [PATCH] ci: Fix distro detection Signed-off-by: Manu Bretelle --- helpers.sh | 6 +++--- setup-build-env/install_clang.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helpers.sh b/helpers.sh index ffab395..232dcab 100644 --- a/helpers.sh +++ b/helpers.sh @@ -56,10 +56,10 @@ kernel_build_make_jobs() { echo $(( smp > MAX_MAKE_JOBS ? MAX_MAKE_JOBS : smp )) } -distro_codename() { - DISTRO_CODENAME="noble" +distrib_codename() { + DISTRIB_CODENAME="noble" test -f /etc/lsb-release && . /etc/lsb-release - echo "${DISTRO_CODENAME}" + echo "${DISTRIB_CODENAME}" } # Convert a platform (as returned by uname -m) to the kernel diff --git a/setup-build-env/install_clang.sh b/setup-build-env/install_clang.sh index f5008db..c46b529 100755 --- a/setup-build-env/install_clang.sh +++ b/setup-build-env/install_clang.sh @@ -14,9 +14,9 @@ else REPO_DISTRO_SUFFIX="-${LLVM_VERSION}" fi -DISTRO_CODENAME=$(distro_codename) +DISTRIB_CODENAME=$(distrib_codename) -echo "deb https://apt.llvm.org/${DISTRO_CODENAME}/ llvm-toolchain-${DISTRO_CODENAME}${REPO_DISTRO_SUFFIX} main" | sudo tee /etc/apt/sources.list.d/llvm.list +echo "deb https://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}${REPO_DISTRO_SUFFIX} main" | sudo tee /etc/apt/sources.list.d/llvm.list n=0 while [ $n -lt 5 ]; do set +e && \