maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build-update-distribution-check' into integration_2024_w35

Browse Source
This commit is contained in:
Robert Schmidt
2024-09-01 19:54:22 +02:00
parent 574c4df949 67da31a8b6
commit fa7040f3c5
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/build_helper
+7 -16
View File
@@ -34,7 +34,7 @@ case "$OS_DISTRO" in
fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;; rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;;
rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; 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" ;; debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
esac esac
@@ -104,18 +104,10 @@ check_supported_distribution() {
local distribution=$(get_distribution_release) local distribution=$(get_distribution_release)
case "$distribution" in case "$distribution" in
"ubuntu24.04") return 0 ;; "ubuntu24.04") return 0 ;;
"ubuntu23.10") return 0 ;;
"ubuntu22.04") return 0 ;; "ubuntu22.04") return 0 ;;
"ubuntu21.04") return 0 ;;
"ubuntu20.04") return 0 ;; "ubuntu20.04") return 0 ;;
"debian11") return 0 ;; "debian11") return 0 ;;
"fedora36") return 0 ;; "fedora40") return 0 ;;
"fedora37") 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.2") return 0 ;;
"rhel8.3") return 0 ;; "rhel8.3") return 0 ;;
"rhel8.4") return 0 ;; "rhel8.4") return 0 ;;
@@ -129,8 +121,7 @@ check_supported_distribution() {
"rhel9.2") return 0 ;; "rhel9.2") return 0 ;;
"rhel9.3") return 0 ;; "rhel9.3") return 0 ;;
"rhel9.4") return 0 ;; "rhel9.4") return 0 ;;
"centos7") return 0 ;; "centos9") return 0 ;; # CentOS stream
"centos8") return 0 ;;
"rocky8.7") return 0 ;; "rocky8.7") return 0 ;;
"rocky8.8") return 0 ;; "rocky8.8") return 0 ;;
"rocky8.9") return 0 ;; "rocky8.9") return 0 ;;
@@ -388,16 +379,16 @@ install_usrp_uhd_driver() {
# On newer kernels, it fails to install # On newer kernels, it fails to install
$SUDO apt-get -y install uhd-host $SUDO apt-get -y install uhd-host
fi fi
# quick workaround for RHE7.6 # quick workaround for below distributions
local distribution=$(get_distribution_release) local distribution=$(get_distribution_release)
if [ -z $1 ]; then 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 $SUDO /usr/local/bin/uhd_images_downloader
else else
$SUDO uhd_images_downloader $SUDO uhd_images_downloader
fi fi
else 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 $SUDO /usr/local/bin/uhd_images_downloader -i $1
else else
$SUDO uhd_images_downloader -i $1 $SUDO uhd_images_downloader -i $1
@@ -537,7 +528,7 @@ check_install_additional_tools (){
local optional_packages="" local optional_packages=""
if [[ "$OS_BASEDISTRO" == "debian" ]]; then if [[ "$OS_BASEDISTRO" == "debian" ]]; then
case "$(get_distribution_release)" in 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" optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib python3-pyroute2 universal-ctags"
;; ;;
esac esac