diff --git a/JuniperControllerBuild b/JuniperControllerBuild index 7284206..173c27f 100755 --- a/JuniperControllerBuild +++ b/JuniperControllerBuild @@ -38,11 +38,9 @@ rm -Rf ~/.repo* cd $HOME echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections sudo apt-get update -sudo apt-get -y install pkgconf -sudo apt-get -y install autoconf automake bison debhelper flex libexpat-dev libgettextpo0 libtool libxml2-utils make python-all python-dev python-lxml python-setuptools python-sphinx ruby-ronn scons unzip vim-common libsnmp-python libfixbuf3 libfixbuf3-dev zlib1g-dev -sudo apt-get -y install glibc-source - -sudo apt-get -y install libsslcommon2 libssl-dev +sudo apt-get -y install pkgconf libcurl4-openssl-dev autoconf automake bison debhelper flex libexpat-dev \ + libgettextpo0 libtool libxml2-utils make python-all python-dev python-lxml python-setuptools python-sphinx \ + ruby-ronn scons unzip vim-common libsnmp-python libfixbuf3 libfixbuf3-dev zlib1g-dev glibc-source libsslcommon2 libssl-dev cd ~/src # sudo cp /media/sf_VM-sfolder/build/openssl-1.0.2d.tar.gz . # sudo chown rein:rein openssl-1.0.2d.tar.gz @@ -346,9 +344,7 @@ sudo -H pip install generateDS --upgrade echo "doScons" > ~/next -date >> $HOME/JuniperControllerBuild.run.time - -sudo reboot - -date >> $HOME/JuniperControllerBuild.run.time - +# should fix "scons: *** [build/packages/contrail/usr/bin/contrail-k8s-cni] build/production/container/cni/bin/kube_cni: No such file or directory" +# taken from here: https://github.com/zioc/contrail-devstack-plugin/issues/27 +CONTRAIL_PATCHES='cd $CONTRAIL_DEST/controller && git fetch https://review.opencontrail.org/Juniper/contrail-controller refs/changes/52/32652/4 && git cherry-pick FETCH_HEAD' +make -f packages.make all