Re-do java-8 handling, add unattended switch to toplevel Makefile
Change-Id: Ifaea353be5b42bb6edbcfa0506d02b721c00e392
Signed-off-by: Damjan Marion <damarion@cisco.com>
diff --git a/Makefile b/Makefile
index 5393092..f9a9543 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,12 @@
GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
+#
+# OS Detection
+#
+OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
@@ -34,6 +40,10 @@
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
endif
+ifeq ($(findstring y,$(UNATTENDED)),y)
+CONFIRM=-y
+endif
+
.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
.PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
.PHONY: ctags cscope
@@ -77,19 +87,8 @@
@echo " PLATFORM = $(PLATFORM)"
@echo " DPDK_VERSION = $(DPDK_VERSION)"
-# openjdk-8-jdk is not available in 14.04 repos by default
-define use_ppa_for_jdk8
-if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
- sudo apt-get -y install software-properties-common; \
- sudo add-apt-repository -y ppa:openjdk-r/ppa; \
- sudo apt-get update; \
-fi;
-endef
-
$(BR)/.bootstrap.ok:
-ifeq ("$(shell lsb_release -si)", "Ubuntu")
- $(use_ppa_for_jdk8)
-
+ifeq ($(OS_ID),ubuntu)
@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
if [ -n "$$MISSING" ] ; then \
echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@@ -118,13 +117,17 @@
bootstrap: $(BR)/.bootstrap.ok
install-dep:
-ifeq ("$(shell lsb_release -si)", "Ubuntu")
- $(use_ppa_for_jdk8)
- @sudo apt-get -y install $(DEB_DEPENDS)
+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
+endif
+ @sudo apt-get $(CONFIRM) install $(DEB_DEPENDS)
else ifneq ("$(wildcard /etc/redhat-release)","")
- @sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
- @sudo yum install -y $(RPM_DEPENDS)
- @sudo yum install -y --enablerepo=epel $(EPEL_DEPENDS)
+ @sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+ @sudo yum install $(CONFIRM) $(RPM_DEPENDS)
+ @sudo yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
@sudo debuginfo-install glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
else
$(error "This option currently works only on Ubuntu or Centos systems")
diff --git a/build-root/vagrant/build.sh b/build-root/vagrant/build.sh
index 45a7eb4..aaaa62f 100755
--- a/build-root/vagrant/build.sh
+++ b/build-root/vagrant/build.sh
@@ -34,7 +34,7 @@
# Install dependencies
cd $VPP_DIR
-make install-dep
+make UNATTENDED=yes install-dep
# Really really clean things up so we can be sure
# that the build works even when switching distros