Merge "UL data path changes at Phy stub, RLC UL UM and DU APP [Issue-ID: ODUHIGH...

diff --git a/Dockerfile b/Dockerfile
index a4c5584..ee130dc 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN cd build/odu && make clean_odu odu MACHINE=BIT64 MODE=FDD
 #cleanup netconf folder and install libraries
 RUN cd build/o1  && rm -rf netconf && /bin/bash install_lib.sh -c
 
-#RUN cd build/o1  && make o1 MACHINE=BIT64  #temporary fix
+RUN cd build/o1  && make o1 MACHINE=BIT64
 
 # Install the data models based on the ODU yang model
 RUN /usr/local/bin/sysrepoctl -i build/o1/yang/o-ran-sc-odu-alarm-v1.yang

diff --git a/build/o1/install_lib.sh b/build/o1/install_lib.sh
index 46efb3e..da44611 100755 (executable)
--- a/build/o1/install_lib.sh
+++ b/build/o1/install_lib.sh
@@ -113,7 +113,7 @@ install_netconf_lib() {
 
    #1. libssh
    cd $NETCONF_PATH && \
-      git clone http://git.libssh.org/projects/libssh.git && \
+      git clone -b v0-7 --depth 1 http://git.libssh.org/projects/libssh.git && \
       cd libssh; mkdir build; cd build && \
       cmake .. && \
       make && \
@@ -123,7 +123,7 @@ install_netconf_lib() {
 
    # libyang
    cd $NETCONF_PATH && \
-      git clone https://github.com/CESNET/libyang.git && \
+      git clone -b v1.0.184 --depth 1 https://github.com/CESNET/libyang.git && \
       cd libyang && mkdir build && cd build && \
       cmake -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF \
             -DCMAKE_BUILD_TYPE:String="Debug" -DENABLE_BUILD_TESTS=OFF .. && \
@@ -135,7 +135,7 @@ install_netconf_lib() {
 
    # sysrepo
    cd $NETCONF_PATH && \
-      git clone https://github.com/sysrepo/sysrepo.git && \
+      git clone -b v1.4.70 --depth 1  https://github.com/sysrepo/sysrepo.git && \
       cd sysrepo && sed -i -e 's/2000/30000/g;s/5000/30000/g' src/common.h.in && \
       mkdir build && cd build && \
       cmake -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF \
@@ -149,7 +149,7 @@ install_netconf_lib() {
 
    # libnetconf2
    cd $NETCONF_PATH && \
-      git clone https://github.com/CESNET/libnetconf2.git && \
+      git clone -b v1.1.36 --depth 1 https://github.com/CESNET/libnetconf2.git && \
       cd libnetconf2 && mkdir build && cd build && \
       cmake -DCMAKE_BUILD_TYPE:String="Debug" -DENABLE_BUILD_TESTS=OFF .. && \
       make -j2 && \
@@ -160,7 +160,7 @@ install_netconf_lib() {
 
    # netopeer2
    cd $NETCONF_PATH && \
-      git clone https://github.com/CESNET/Netopeer2.git && \
+      git clone -b v1.1.53 --depth 1 https://github.com/CESNET/Netopeer2.git && \
       cd Netopeer2 && mkdir build && cd build && \
       cmake -DCMAKE_BUILD_TYPE:String="Debug" -DNP2SRV_DATA_CHANGE_TIMEOUT=30000 \
             -DNP2SRV_DATA_CHANGE_WAIT=OFF .. && \