VPP-65: Fix top-level "make install-dep" to work behind a firewall /

proxy-server on Ubuntu.


Change-Id: I3f662455728adb81ca5a079540d8a9c615a5b977
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace
2016-05-13 19:00:29 -04:00
committed by Dave Barach
parent 195bceec56
commit ed18a1c840

View File

@ -128,11 +128,11 @@ bootstrap: $(BR)/.bootstrap.ok
install-dep:
ifeq ($(OS_ID),ubuntu)
ifeq ($(OS_VERSION_ID),14.04)
@sudo apt-get $(CONFIRM) install software-properties-common
@sudo add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
@sudo apt-get update
@sudo -E apt-get $(CONFIRM) install software-properties-common
@sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
@sudo -E apt-get update
endif
@sudo apt-get $(CONFIRM) install $(DEB_DEPENDS)
@sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo yum install $(CONFIRM) $(RPM_DEPENDS)