Merge branch 'fix_ubuntu20_04_installation' into 'develop'

Fix ubuntu20 04 installation

See merge request oai/cn5g/oai-cn5g-smf!130

build/scripts/build_helper.fb_folly

@@ -67,9 +67,9 @@ install_fb_folly_from_source(){
       ret=$?;[[ $ret -ne 0 ]] && return $ret
     elif [[ $OS_DISTRO == "ubuntu" ]]; then
       $SUDO $INSTALLER install $OPTION \
+        $CMAKE \
         g++ \
         libevent-dev \
-        libboost1.67-dev \
         libdouble-conversion-dev \
         libgoogle-glog-dev \
         libgflags-dev \

build/scripts/build_helper.smf

@@ -373,7 +373,10 @@ check_install_smf_deps() {
         # PPA has 1.67
         $SUDO add-apt-repository ppa:mhier/libboost-latest --yes
         $SUDO $INSTALLER update
-        specific_packages="libconfig++-dev"        
+        specific_packages="libconfig++-dev libboost-all-dev"        
+      ;;
+      "ubuntu20.04")
+        specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
       ;;
       *)
         specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
@@ -382,11 +385,10 @@ check_install_smf_deps() {
     # removed libspdlog-dev
     PACKAGE_LIST="\
       $specific_packages \
-      libboost1.67-dev \
       guile-2.0-dev \
       libcurl4-gnutls-dev \
       libevent-dev \
-      libgcrypt11-dev \
+      libgcrypt?-dev \
       libgmp-dev \
       libhogweed? \
       libidn2-0-dev \
@@ -403,7 +405,7 @@ check_install_smf_deps() {
       net-tools \
       pkg-config \
       wget \
-      libasan2"
+      libasan?"
   elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
     PACKAGE_LIST="\
       guile-devel \
@@ -430,6 +432,17 @@ check_install_smf_deps() {
   fi
   echo "Install distro libs"
   $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
   echo "distro libs installation complete"
 

docker/Dockerfile.smf.rhel8

@@ -47,7 +47,8 @@ RUN rm -f /etc/rhsm-host && \
         psmisc \
         git \
         diffutils \
-        file && \
+        file \
+        boost-devel &&\
     rm -rf /var/lib/apt/lists/* 
 
 # Some GIT configuration command quite useful