X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fhelper-scripts%2Frapid%2Fdeploycentostools.sh;h=c50d796821176ce7179b3122a3eba15ec9fc4a3d;hb=d85020c43d0c65dc3891bd4cc03a159f918c62cc;hp=f4d92d883c5fc21b64d9ef3902d08fe4d0f2477c;hpb=c8b5dd5aa379c9b8fd60a66be16351f62e5e5ebb;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index f4d92d88..c50d7968 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
@@ -18,15 +18,9 @@
 # Directory for package build
 BUILD_DIR="/opt/rapid"
 DPDK_VERSION="20.05"
-PROX_COMMIT="8442f6a8ce0962d818b7cd800150980c65983719"
-PROX_CHECKOUT="git checkout ${PROX_COMMIT}"
-## Next line is overruling the PROX_COMMIT and will replace the version with a very specific patch. Should be commented out
-## 	if you want to use a committed version of PROX with the COMMIT ID specified above
-## As an example: Following line has the commit for testing IMIX, IPV6, ... It is the merge of all PROX commits on May 27th 2020
-#PROX_CHECKOUT="git fetch \"https://gerrit.opnfv.org/gerrit/samplevnf\" refs/changes/23/70223/1 && git checkout FETCH_HEAD"
 MULTI_BUFFER_LIB_VER="0.52"
-export RTE_SDK="${BUILD_DIR}/dpdk"
-export RTE_TARGET="build"
+export RTE_SDK="${BUILD_DIR}/dpdk-${DPDK_VERSION}"
+export RTE_TARGET="x86_64-native-linuxapp-gcc"
 
 # By default, do not update OS
 OS_UPDATE="n"
@@ -167,6 +161,8 @@ function prox_compile()
 {
     # Compile PROX
     pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
+    COMMIT_ID=$(git rev-parse HEAD)
+    echo "${COMMIT_ID}" > ${BUILD_DIR}/commit_id
     make -j`getconf _NPROCESSORS_ONLN`
     ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox
     popd > /dev/null 2>&1
@@ -177,8 +173,6 @@ function prox_install()
     # Clone PROX
     pushd ${BUILD_DIR} > /dev/null 2>&1
     git clone https://git.opnfv.org/samplevnf
-    bash -c "${PROX_CHECKOUT}"
-    echo "${PROX_CHECKOUT}" > ${BUILD_DIR}/commit_id
     cp -R ./samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid ./src
     popd > /dev/null 2>&1
     prox_compile