diff options
author | Pierre Pfister <ppfister@cisco.com> | 2017-03-30 15:02:51 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2017-03-30 15:02:51 +0000 |
commit | 4eb8e0b16288481c66635e91b488eb86254ccad9 (patch) | |
tree | 4b72f1e6abe68af72bb3d3c8f836950b7ec630c1 /vpp-bootstrap/containers/ctwo.provision.sh | |
parent | a54fc6bd0805d7f60451d608cd4b4781197de34b (diff) | |
parent | eae889b38209f58f169356cc2229658fbb616bbd (diff) |
Merge "vpp-bootstrap:"
Diffstat (limited to 'vpp-bootstrap/containers/ctwo.provision.sh')
-rwxr-xr-x | vpp-bootstrap/containers/ctwo.provision.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vpp-bootstrap/containers/ctwo.provision.sh b/vpp-bootstrap/containers/ctwo.provision.sh index 2ba66c6..d8e5796 100755 --- a/vpp-bootstrap/containers/ctwo.provision.sh +++ b/vpp-bootstrap/containers/ctwo.provision.sh @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +VPP_VERSION=v17.01 VPP_DIR=~/vpp VPP_GIT="https://git.fd.io/vpp" -#PLATFORM=vpp_lite -PLATFORM=vpp +PLATFORM=vpp_lite echo Cloning $VPP_GIT git clone $VPP_GIT $VPP_DIR @@ -23,6 +23,7 @@ git clone $VPP_GIT $VPP_DIR # Install dependencies echo Building $VPP_DIR cd $VPP_DIR +git checkout -b $VPP_VERSION $VPP_VERSION make UNATTENDED=yes install-dep make wipe @@ -31,10 +32,7 @@ rm -f build-root/.bootstrap.ok # Build and install packaging make PLATFORM=$PLATFORM bootstrap -make PLATFORM=$PLATFORM pkg-deb - -# Install VPPP -(cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb) - -sudo sed -i 's/dpdk {/dpdk {\n\tno-pci\n/' /etc/vpp/startup.conf -sudo service vpp start +make PLATFORM=$PLATFORM build +#not sure why this is needed to called explicitly +make PLATFORM=$PLATFORM build-vpp-api +make PLATFORM=$PLATFORM plugins |