diff options
Diffstat (limited to 'build-root')
| -rwxr-xr-x | build-root/bootstrap.sh | 4 | ||||
| -rw-r--r-- | build-root/packages/vppversion.mk | 5 | ||||
| -rw-r--r-- | build-root/vagrant/Vagrantfile | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh index 3ae94098ee2..bc833f12d96 100755 --- a/build-root/bootstrap.sh +++ b/build-root/bootstrap.sh @@ -41,7 +41,7 @@ done cd $wsroot -for dir in vppapigen vppinfra sample-plugin vppversion svm vlib vlib-api vnet \ +for dir in vppapigen vppinfra sample-plugin svm vlib vlib-api vnet \ vpp vpp-api-test vpp-japi do cd $dir @@ -52,7 +52,7 @@ done cd $build_root echo Compile native tools -for tool in vppapigen vppversion +for tool in vppapigen do make V=0 is_build_tool=yes $tool-install done diff --git a/build-root/packages/vppversion.mk b/build-root/packages/vppversion.mk deleted file mode 100644 index 3ccde62b3f5..00000000000 --- a/build-root/packages/vppversion.mk +++ /dev/null @@ -1,5 +0,0 @@ -vppversion_configure_depend = vppinfra-install - -vppversion_CPPFLAGS = $(call installed_includes_fn, vppinfra) - -vppversion_LDFLAGS = $(call installed_libs_fn, vppinfra) diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index 9c61dd33af2..4e2669b513a 100644 --- a/build-root/vagrant/Vagrantfile +++ b/build-root/vagrant/Vagrantfile @@ -22,6 +22,13 @@ Vagrant.configure(2) do |config| config.cache.scope = :box end + # use http proxy if avaiable + if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf") + config.proxy.http = "$http_proxy" + config.proxy.https = "$https_proxy" + config.proxy.no_proxy = "localhost,127.0.0.1" + end + config.vm.synced_folder "../../", "/vpp", disabled: false config.vm.provider "virtualbox" do |vb| vb.memory = "4096" |