X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel-plugin-ovsnfv%2Fpre_build_hook;h=0b37c9069e015198df54b2b53d087a163e163477;hb=refs%2Fchanges%2F75%2F28475%2F2;hp=c8d1ce352b4d5ad438be91e30922e2102592b16b;hpb=93f7683a2cd9b8020f8870dfc6b162b3d61c3fd2;p=ovsnfv.git

diff --git a/fuel-plugin-ovsnfv/pre_build_hook b/fuel-plugin-ovsnfv/pre_build_hook
index c8d1ce3..0b37c90 100755
--- a/fuel-plugin-ovsnfv/pre_build_hook
+++ b/fuel-plugin-ovsnfv/pre_build_hook
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
 set -eux
 
 BUILD_FOR=${BUILD_FOR:-ubuntu}
@@ -13,31 +27,30 @@ networking_ovs_dpdk=${networking_ovs_dpdk:-master}
 
 rm -rf ${TMP}
 mkdir -p ${TMP}
-rm -rf ${DIR}/repositories/${BUILD_FOR}/*
 
 # sudo apt-get install -qq --reinstall --print-uris bash | perl -lne "/'(.*?)'/;print \$1"
 if [ "$INCLUDE_DEPENDENCIES" = true ]
 then
+  rm -rf ${DIR}/repositories/${BUILD_FOR}/*
   wget --content-disposition -N -P ${DIR}/repositories/${BUILD_FOR}/ -i "${DIR}/ovs_package/${BUILD_FOR}/dependencies.txt"
 fi
 
 cd ${TMP}
 
-rm -rf ${TMP}/networking-ovs-dpdk
-git clone https://github.com/openstack/networking-ovs-dpdk ${TMP}/networking-ovs-dpdk
-#rm -rf ${TMP}/networking-ovs-dpdk/.git #Install requires this to be a git repo
+git clone https://github.com/openstack/networking-ovs-dpdk --branch stable/liberty --single-branch networking-ovs-dpdk
+rm -rf ${TMP}/networking_ovs_dpdk/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/networking-ovs-dpdk.tgz networking-ovs-dpdk
 
-rm -rf ${TMP}/ovs
-git clone https://github.com/openvswitch/ovs  --branch master --single-branch ovs
+git clone https://github.com/openvswitch/ovs
+cd ovs
+git checkout 1e77bbe565bbf5ae7f4c47f481a4097d666d3d68
+cd ..
 rm -rf ${TMP}/ovs/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/ovs.tgz ovs
 
-rm -rf ${TMP}/dpdk
-git clone http://dpdk.org/git/dpdk --branch v2.1.0 --single-branch dpdk
+git clone http://dpdk.org/git/dpdk --branch v2.0.0 --single-branch dpdk
 rm -rf ${TMP}/dpdk/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/dpdk.tgz dpdk
 
-cd -
+cd $DIR
 rm -rf ${TMP}
-