Enhance 6Wind quagga image on ubuntu16 & centos7

This is to enhance 6Wind Quagga router images
with 6Wind Quagga check-in fix tag 20170418
and modify compilation mode as 'evpn mode'

Change-Id: I352931fcc6cb4baf23e5d758542f89b4779f2fe8
Signed-off-by: Dhevendran Kulandaibvel <dhevendran.k@tcs.com>

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index b160dd9ba839569e88bbd0f3887f3db492ab7534..9bfa6aab90267a1366586a25aee11934fb939104 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -73,15 +73,15 @@ unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
 # rename packer to avoid conflict with binary in cracklib
 mv /usr/local/bin/packer /usr/local/bin/packer.io
 
-#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities
+#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
 echo "---> Installing the Quagga..."
 mkdir -p /tmp/build_quagga
 cd /tmp/build_quagga
 git clone https://github.com/6WIND/zrpcd.git
 cd zrpcd
-git checkout 20170330
+git checkout 20170418
 chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
 
 # Removing the build_quagga folder
 rm -rf /tmp/build_quagga/

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 68999d83ded120afaf4cacb6b170f7dff97f4938..90258f4e42b644b0f0c1c9ca52cd9ac6a668dc3a 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -48,22 +48,15 @@ apt-get install vlan
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
 
-#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities
-echo "---> Installing the 6Wind Quagga..."
+#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
+echo "---> Installing the Quagga..."
 mkdir -p /tmp/build_quagga
 cd /tmp/build_quagga
 git clone https://github.com/6WIND/zrpcd.git
 cd zrpcd
-git checkout 20170330
+git checkout 20170418
 chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-
-# On Ubuntu 16.04, the 6Wind Quagga top level build script needs to be enhanced to use
-# the right libboost version for this git check-in tag name '20170330'.
-sed -e 's/libboost1.55-all-dev/libboost1.58-all-dev/' \
-pkgsrc/dev_compile_script.sh > pkgsrc/dev_compile_ubuntu16.04_script.sh
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh
-
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh -d -b -t
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
 
 # Removing the build_quagga folder
 rm -rf /tmp/build_quagga/