Commit df93c43e authored by Robert Schmidt's avatar Robert Schmidt Committed by Manish

Add support for Ubuntu 22

parent 255f4f1f
...@@ -103,6 +103,7 @@ get_distribution_release() { ...@@ -103,6 +103,7 @@ get_distribution_release() {
check_supported_distribution() { check_supported_distribution() {
local distribution=$(get_distribution_release) local distribution=$(get_distribution_release)
case "$distribution" in case "$distribution" in
"ubuntu22.04") return 0 ;;
"ubuntu21.04") return 0 ;; "ubuntu21.04") return 0 ;;
"ubuntu20.04") return 0 ;; "ubuntu20.04") return 0 ;;
"ubuntu18.04") return 0 ;; "ubuntu18.04") return 0 ;;
...@@ -280,7 +281,7 @@ install_protobuf_c_from_source(){ ...@@ -280,7 +281,7 @@ install_protobuf_c_from_source(){
install_protobuf_c() { install_protobuf_c() {
local protobuf_packages="" local protobuf_packages=""
case "$(get_distribution_release)" in case "$(get_distribution_release)" in
"ubuntu18.04" | "ubuntu20.04" | "ubuntu21.04") "ubuntu18.04" | "ubuntu20.04" | "ubuntu21.04" | "ubuntu22.04")
protobuf_packages="protobuf-c-compiler libprotobuf-c1 libprotobuf-c-dev" protobuf_packages="protobuf-c-compiler libprotobuf-c1 libprotobuf-c-dev"
;; ;;
esac esac
...@@ -555,10 +556,10 @@ check_install_additional_tools (){ ...@@ -555,10 +556,10 @@ check_install_additional_tools (){
if [[ "$OS_DISTRO" == "ubuntu" ]]; then if [[ "$OS_DISTRO" == "ubuntu" ]]; then
case "$(get_distribution_release)" in case "$(get_distribution_release)" in
"ubuntu16.04"| "ubuntu18.04") "ubuntu16.04"| "ubuntu18.04")
optional_packages="python-dev python-pexpect python-numpy python-scipy python-matplotlib" optional_packages="python-dev python-pexpect python-numpy python-scipy python-matplotlib ctags"
;; ;;
"ubuntu20.04"| "ubuntu21.04") "ubuntu20.04" | "ubuntu21.04" | "ubuntu22.04" )
optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib exuberant-ctags" optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib universal-ctags"
;; ;;
esac esac
PACKAGE_LIST="\ PACKAGE_LIST="\
...@@ -577,7 +578,6 @@ check_install_additional_tools (){ ...@@ -577,7 +578,6 @@ check_install_additional_tools (){
unzip \ unzip \
valgrind \ valgrind \
vlan \ vlan \
ctags \
ntpdate \ ntpdate \
iperf3 \ iperf3 \
android-tools-adb \ android-tools-adb \
...@@ -675,20 +675,25 @@ check_install_oai_software() { ...@@ -675,20 +675,25 @@ check_install_oai_software() {
$SUDO apt install -y software-properties-common $SUDO apt install -y software-properties-common
case "$(get_distribution_release)" in case "$(get_distribution_release)" in
"ubuntu16.04") "ubuntu16.04")
specific_packages="libtasn1-6-dev libgnutls-dev libatlas-dev iproute libconfig8-dev iptables-dev libgcrypt11-dev python-pip pydb" specific_packages="libtasn1-6-dev libgnutls-dev libatlas-dev iproute libconfig8-dev iptables-dev libgcrypt11-dev python-pip pydb python guile-2.0-dev"
;; ;;
"ubuntu18.04") "ubuntu18.04")
specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev iptables-dev libgcrypt11-dev python-pip pydb" specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev iptables-dev libgcrypt11-dev python-pip pydb python guile-2.0-dev"
LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu" LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu"
LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so" LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so"
;; ;;
"ubuntu20.04") "ubuntu20.04")
specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev" specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev python guile-2.0-dev"
LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu" LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu"
LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so" LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so"
;; ;;
"ubuntu21.04") "ubuntu21.04")
specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev" specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev python guile-2.0-dev"
LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu"
LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so"
;;
"ubuntu22.04")
specific_packages="libtasn1-6-dev libgnutls28-dev iproute2 libconfig-dev python2 guile-2.2-dev"
LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu" LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu"
LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so" LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so"
;; ;;
...@@ -714,7 +719,6 @@ check_install_oai_software() { ...@@ -714,7 +719,6 @@ check_install_oai_software() {
git \ git \
graphviz \ graphviz \
gtkwave \ gtkwave \
guile-2.0-dev \
iperf \ iperf \
iptables \ iptables \
libatlas-base-dev \ libatlas-base-dev \
...@@ -743,7 +747,6 @@ check_install_oai_software() { ...@@ -743,7 +747,6 @@ check_install_oai_software() {
openssh-client \ openssh-client \
openssh-server \ openssh-server \
openssl \ openssl \
python \
subversion \ subversion \
xmlstarlet \ xmlstarlet \
libyaml-dev \ libyaml-dev \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment