X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=1b51d8f386951080d9d6addeca2f78daf24b38fb;hb=7a27274a6137f8952c18c78f039774e5cbb44c71;hp=aa15731f1f4de51bb210f1997632295b8acbce74;hpb=aade2c5a703b7d68fb2532e30bf84ab05e2ad152;p=vpp.git diff --git a/Makefile b/Makefile index aa15731f1f4..1b51d8f3869 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -43,6 +43,9 @@ DEB_DEPENDS += lcov chrpath autoconf nasm indent DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless +else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) + DEB_DEPENDS += openjdk-8-jdk-headless + APT_ARGS = -t jessie-backports else DEB_DEPENDS += default-jdk-headless endif @@ -66,6 +69,10 @@ else RPM_DEPENDS += lcov endif +RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static +RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel +RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow + ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf endif @@ -147,7 +154,7 @@ $(BR)/.bootstrap.ok: ifeq ($(findstring y,$(UNATTENDED)),y) make install-dep endif -ifeq ($(OS_ID),ubuntu) +ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \ if [ -n "$$MISSING" ] ; then \ echo "\nPlease install missing packages: \n$$MISSING\n" ; \ @@ -191,20 +198,26 @@ endif bootstrap: $(BR)/.bootstrap.ok install-dep: -ifeq ($(OS_ID),ubuntu) +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 ($(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 ) endif @sudo -E apt-get update - @sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) + @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","") @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib +else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) + @sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS) else - $(error "This option currently works only on Ubuntu or Centos systems") + $(error "This option currently works only on Ubuntu, Debian or Centos systems") endif define make