diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-02-06 15:59:44 +0100 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-27 06:49:09 +0000 |
| commit | 0d2e3e90f1758b03266e9f5934d11995d7b9a728 (patch) | |
| tree | 4b578d7cf92ef0084c8fa25440dba12217ca9d5d /Requirements | |
| parent | 30fb245914274df31263867d8c3f041d1fc158a8 (diff) | |
Jvpp requirements cleanup
- minor bugfixes
- cleanup
Change-Id: I8aeb2688415ee223ec9faeec6509d2c6999cc947
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'Requirements')
| -rw-r--r-- | Requirements/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Requirements/Makefile b/Requirements/Makefile index 7cb01b7..34ad3fa 100644 --- a/Requirements/Makefile +++ b/Requirements/Makefile @@ -28,6 +28,8 @@ SUDO?=sudo ifneq ($(shell uname),Darwin) 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') +$(info Operating system: $(OS_ID)) +$(info Operating system version: $(OS_VERSION_ID)) endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) @@ -47,10 +49,7 @@ DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev DEB_DEPENDS += cmake ninja-build # ADD JDK for JVPP -ifeq ($(OS_VERSION_ID),14.04) - DEB_DEPENDS += openjdk-8-jdk-headless - DEB_DEPENDS += libssl-dev -else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) +ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev APT_ARGS = -t jessie-backports @@ -151,18 +150,13 @@ TARGETS = jvpp .PHONY: help .PHONY: install-dep - help: @echo "Make Targets:" @echo " install-dep - install software dependencies" @echo "" install-dep: -ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) -ifeq ($(OS_VERSION_ID),14.04) - @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common - @sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM) -endif +ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID)) ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \ || ( echo "Please install jessie-backports" ; exit 1 ) |