Merge branch 'vpp_native_install_update' into 'develop'

Instructions updated for vpp native installation.

See merge request oai/cn5g/oai-cn5g-upf-vpp!14

build/scripts/build_helper

@@ -167,7 +167,7 @@ compilations() {
   cd $OPENAIRCN_DIR/$1/
     {
       make build
-      if grep -q "@@ Installing vpp @@" "/home/rohan/gitrepo/oai-cn5g-upf-vpp/build/log/vpp.txt" ; then
+      if grep -q "@@ Installing vpp @@" "$dlog/$2.txt" ; then
         echo_success "##### VPP Compiled Successfully #####"
       else
         echo_error "##### VPP not compiled #####"

build/scripts/build_helper.upf

@@ -108,7 +108,7 @@ install_dep(){
     git clone -b $GIT_BRANCH $GIT_URL
 #    echo  "APT::Get::Assume-Yes "true";" >> /etc/apt/apt.conf.d/90forceyes
 #    echo  "APT::Get::force-yes "true";" >> /etc/apt/apt.conf.d/90forceyes
-    cd vpp && make install-ext-dep
+    cd vpp && make install-dep
     return 0
 }
 
@@ -124,6 +124,7 @@ add_Travelping_upf_plugin(){
   echo_info "Cloning Travelping UPG plugin"
   pushd $OPENAIRCN_DIR/
   git clone -b $GIT_BRANCH $GIT_URL
+  cd $OPENAIRCN_DIR/upg-vpp && git checkout -f 1f047425c5c99db44c2e599ad1dfd767d426cce8
   mkdir -p -- $OPENAIRCN_DIR/vpp/patches
   cp -rf $OPENAIRCN_DIR/upg-vpp/upf/ $OPENAIRCN_DIR/vpp/src/plugins/
   cp -rf $OPENAIRCN_DIR/upg-vpp/vpp-patches/* $OPENAIRCN_DIR/vpp/patches

docs/INSTALL_ON_HOST.md

-
 # VPP-UPF Native Installation
 
 Tested and validated on Ubuntu Bionic arch amd64.
@@ -23,12 +22,28 @@ $ cd oai-cn5g-upf-vpp/
 /oai-cn5g-upf-vpp/build/scripts$ ./build_vpp_upf -I -f
 ```
 
+After successful dependencies install, 
+```bash
+==========================================================
+make[1]: Leaving directory '/tmp/oai-cn5g-upf-vpp/vpp/build/external'
+VPP UPF deps installation successful
+VPP UPF not compiled, to compile it, re-run ./build_vpp_upf without -I option
+```
 ### Build VPP-UPF 
 
 ```bash
 /oai-cn5g-upf-vpp/build/scripts$ ./build_vpp_upf -c -V 
 ```
-
+After successful dependencies install, 
+```bash
+@@@@ Installing vpp @@@@
+[0/1] Install the project...
+-- Install configuration: "debug"
+make[1]: Leaving directory '/home/rohan/oai-cn5g-upf-vpp/vpp/build-root'
+##### VPP compiled #####
+VPP UPG initializing
+Installing VPP
+```
 ### Wipe VPP source
 ```bash
 /oai-cn5g-upf-vpp/build/scripts$ ./build_vpp_upf -w