VPP-20: Verify valid sw_if_index in ip_address_dump.

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f9a9543..8050f87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,13 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 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 += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
+ifeq ($(OS_VERSION_ID),14.04)
+       DEB_DEPENDS += openjdk-8-jdk-headless
+else
+       DEB_DEPENDS += default-jdk-headless
+endif
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
@@ -128,7 +133,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
        @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
+       @sudo debuginfo-install $(CONFIRM) 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")
 endif