Commit efe1c83d authored by sagar arora's avatar sagar arora

Merge branch 'fix_ubuntu20_04_installation' into 'develop'

Fix ubuntu20 04 installation

See merge request oai/cn5g/oai-cn5g-udr!20
parents e5d5d7a6 7bb98cd2
...@@ -376,16 +376,19 @@ check_install_udr_deps() { ...@@ -376,16 +376,19 @@ check_install_udr_deps() {
*) *)
specific_packages="libconfig++-dev libasio-dev libboost-all-dev" specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
;; ;;
"ubuntu20.04")
specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
;;
esac esac
# removed libspdlog-dev # removed libspdlog-dev
PACKAGE_LIST="\ PACKAGE_LIST="\
$specific_packages \ $specific_packages \
libboost1.67-dev \ libconfig++ \
guile-2.0-dev \ guile-2.0-dev \
libcurl4-gnutls-dev \ libcurl4-gnutls-dev \
libevent-dev \ libevent-dev \
libgcrypt11-dev \ libgcrypt?-dev \
libgmp-dev \ libgmp?-dev \
libhogweed? \ libhogweed? \
libidn2-0-dev \ libidn2-0-dev \
libidn11-dev \ libidn11-dev \
...@@ -400,10 +403,9 @@ check_install_udr_deps() { ...@@ -400,10 +403,9 @@ check_install_udr_deps() {
libcurl4 \ libcurl4 \
net-tools \ net-tools \
pkg-config \ pkg-config \
mysql-server \
mysql-client \ mysql-client \
libmysqlclient-dev \ libmysqlclient-dev \
libasan2" libasan?"
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
PACKAGE_LIST="\ PACKAGE_LIST="\
guile-devel \ guile-devel \
...@@ -432,6 +434,17 @@ check_install_udr_deps() { ...@@ -432,6 +434,17 @@ check_install_udr_deps() {
fi fi
echo "Install distro libs" echo "Install distro libs"
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
# fix issue with libboost in U18 for a bare metal deployment
if [[ $OS_DISTRO == "ubuntu" ]]; then
case "$(get_distribution_release)" in
"ubuntu18.04")
$SUDO $INSTALLER remove $OPTION libboost1.65-dev || true
$SUDO $INSTALLER install $OPTION libboost1.67-dev
;;
esac
fi
ret=$?;[[ $ret -ne 0 ]] && return $ret ret=$?;[[ $ret -ne 0 ]] && return $ret
echo "distro libs installation complete" echo "distro libs installation complete"
......
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