From 382de78c66be66791e686e42247bfe3b04956787 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 26 Aug 2024 10:59:07 +0200 Subject: [PATCH 1/3] Distribution check: update to current Fedora 40 Closes: #825 --- cmake_targets/tools/build_helper | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index ac336478df..b2436db8d7 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -109,8 +109,7 @@ check_supported_distribution() { "ubuntu21.04") return 0 ;; "ubuntu20.04") return 0 ;; "debian11") return 0 ;; - "fedora36") return 0 ;; - "fedora37") return 0 ;; + "fedora40") return 0 ;; "rhel7") return 0 ;; "rhel7.6") return 0 ;; "rhel7.7") return 0 ;; From 867a06b302bbf464399aa6b772f830dfc96b3044 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 26 Aug 2024 11:01:41 +0200 Subject: [PATCH 2/3] Distribution check: Remove EOL Ubuntu releases See also https://ubuntu.com/about/release-cycle --- cmake_targets/tools/build_helper | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index b2436db8d7..76707b822b 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -104,9 +104,7 @@ check_supported_distribution() { local distribution=$(get_distribution_release) case "$distribution" in "ubuntu24.04") return 0 ;; - "ubuntu23.10") return 0 ;; "ubuntu22.04") return 0 ;; - "ubuntu21.04") return 0 ;; "ubuntu20.04") return 0 ;; "debian11") return 0 ;; "fedora40") return 0 ;; @@ -536,7 +534,7 @@ check_install_additional_tools (){ local optional_packages="" if [[ "$OS_BASEDISTRO" == "debian" ]]; then case "$(get_distribution_release)" in - "ubuntu20.04" | "ubuntu21.04" | "ubuntu22.04" | "debian11" ) + "ubuntu20.04" | "ubuntu22.04" | "debian11" ) optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib python3-pyroute2 universal-ctags" ;; esac From 67da31a8b6730e8c58d2bf411f2e4dfe4e97eabb Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 26 Aug 2024 11:06:25 +0200 Subject: [PATCH 3/3] Add CentOS stream support, remove CentOS 7+8 and RHEL7 At least in Eurecom, there are no RHEL 7/CentOS 7+8 servers. Existing installations will work, but we don't want to encourage people to use these old distributions, so remove it. Also, they reached EOL Add CentOS stream as an alternative. --- cmake_targets/tools/build_helper | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 76707b822b..30cb1f0b00 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -34,7 +34,7 @@ case "$OS_DISTRO" in fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;; rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; - centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;; + centos) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;; # CentOS Stream debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; esac @@ -108,11 +108,6 @@ check_supported_distribution() { "ubuntu20.04") return 0 ;; "debian11") return 0 ;; "fedora40") return 0 ;; - "rhel7") return 0 ;; - "rhel7.6") return 0 ;; - "rhel7.7") return 0 ;; - "rhel7.8") return 0 ;; - "rhel7.9") return 0 ;; "rhel8.2") return 0 ;; "rhel8.3") return 0 ;; "rhel8.4") return 0 ;; @@ -126,8 +121,7 @@ check_supported_distribution() { "rhel9.2") return 0 ;; "rhel9.3") return 0 ;; "rhel9.4") return 0 ;; - "centos7") return 0 ;; - "centos8") return 0 ;; + "centos9") return 0 ;; # CentOS stream "rocky8.7") return 0 ;; "rocky8.8") return 0 ;; "rocky8.9") return 0 ;; @@ -385,16 +379,16 @@ install_usrp_uhd_driver() { # On newer kernels, it fails to install $SUDO apt-get -y install uhd-host fi - # quick workaround for RHE7.6 + # quick workaround for below distributions local distribution=$(get_distribution_release) if [ -z $1 ]; then - if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then + if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]] || [[ "$OS_DISTRO" == "centos" ]]; then $SUDO /usr/local/bin/uhd_images_downloader else $SUDO uhd_images_downloader fi else - if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then + if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]] || [[ "$OS_DISTRO" == "centos" ]]; then $SUDO /usr/local/bin/uhd_images_downloader -i $1 else $SUDO uhd_images_downloader -i $1