X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=6dd2fc2e3fe8608d613da78e0565d7cf4db1b5ca;hb=16aa7f83c74017a35bbeb47d09d8cc3e731ae6b1;hp=1cce928aa1a2453356e24a672a1034d8a11137e3;hpb=b60f4965bf6f51eb746e18fa0307af8e3444bf96;p=vpp.git

diff --git a/Makefile b/Makefile
index 1cce928aa1a..6dd2fc2e3fe 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+MACHINE=$(shell uname -m)
 
 ,:=,
 define disable_plugins
@@ -57,27 +58,49 @@ endif
 
 # +libganglia1-dev if building the gmond plugin
 
-DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
+DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm indent
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
+DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev
 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)
 	DEB_DEPENDS += openjdk-8-jdk-headless
+	DEB_DEPENDS += libssl-dev
 	APT_ARGS = -t jessie-backports
-else
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
+	DEB_DEPENDS += default-jdk-headless
+	DEB_DEPENDS += libssl1.0-dev
+else 
 	DEB_DEPENDS += default-jdk-headless
+	DEB_DEPENDS += libssl-dev
 endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
-RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel
+RPM_DEPENDS += apr-devel
+RPM_DEPENDS += numactl-devel
+RPM_DEPENDS += check check-devel
+RPM_DEPENDS += boost boost-devel
+RPM_DEPENDS += subunit subunit-devel
+RPM_DEPENDS += selinux-policy selinux-policy-devel
+RPM_DEPENDS += mbedtls-devel
+
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+	RPM_DEPENDS += openssl-devel
+	RPM_DEPENDS += python-devel python2-ply
+	RPM_DEPENDS += python2-virtualenv
+	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+	RPM_DEPENDS += compat-openssl10-devel
+	RPM_DEPENDS += python2-devel python2-ply
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
+	RPM_DEPENDS += openssl-devel
+	RPM_DEPENDS += python-devel python-ply
 	RPM_DEPENDS += python-virtualenv
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
@@ -85,21 +108,30 @@ endif
 # +ganglia-devel if building the ganglia plugin
 
 RPM_DEPENDS += chrpath libffi-devel rpm-build
-ifeq ($(OS_ID),fedora)
-	RPM_DEPENDS += nasm
+
+SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
+RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
+RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply
+
+RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel
+RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel
+
+RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip
+RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
+
+RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
+
+ifeq ($(OS_ID),opensuse)
+ifneq ($(SUSE_NAME),Tumbleweed)
+	RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+	RPM_SUSE_PYTHON_DEPS += python-virtualenv
 else
-	RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+	RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+	RPM_SUSE_PYTHON_DEPS += python2-virtualenv
 endif
-EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
-	EPEL_DEPENDS += lcov
-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 nasm
+RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -116,7 +148,7 @@ ifneq ($(SAMPLE_PLUGIN),no)
 TARGETS += sample-plugin
 endif
 
-.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
+.PHONY: help 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
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
@@ -124,7 +156,6 @@ endif
 
 help:
 	@echo "Make Targets:"
-	@echo " bootstrap           - prepare tree for build"
 	@echo " install-dep         - install software dependencies"
 	@echo " wipe                - wipe all products of debug build "
 	@echo " wipe-release        - wipe all products of release build "
@@ -193,7 +224,7 @@ help:
 	@echo " SAMPLE_PLUGIN     = $(SAMPLE_PLUGIN)"
 	@echo " DISABLED_PLUGINS  = $(DISABLED_PLUGINS)"
 
-$(BR)/.bootstrap.ok:
+$(BR)/.deps.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
 	make install-dep
 endif
@@ -206,13 +237,9 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 	fi ; \
 	exit 0
 else ifneq ("$(wildcard /etc/redhat-release)","")
-	@for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+	@for i in $(RPM_DEPENDS) ; do \
 	    RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;	\
-	    if [[ "$$RPM" =~ "epel-release-latest" ]] ; then		\
-	        MISSING+=$$(rpm -q epel-release | grep "^package") ;	\
-	    else							\
-		MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
-	    fi							   ;    \
+	    MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
 	done							   ;	\
 	if [ -n "$$MISSING" ] ; then \
 	  echo "Please install missing RPMs: \n$$MISSING\n" ; \
@@ -221,24 +248,10 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	fi ; \
 	exit 0
 endif
-	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
-	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
-	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
-	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
-	@echo 'export CCACHE_DIR=$(CCACHE_DIR)'           >> $(BR)/path_setup
-
-ifeq ("$(wildcard /usr/bin/ccache )","")
-	@echo "WARNING: Please install ccache AYEC and re-run this script"
-else
-	@rm -rf $(BR)/tools/ccache-bin
-	@mkdir -p $(BR)/tools/ccache-bin
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
-endif
-	@make -C $(BR) V=$(V) is_build_tool=yes tools-install
 	@touch $@
 
-bootstrap: $(BR)/.bootstrap.ok
+bootstrap:
+	@echo "'make bootstrap' is not needed anymore"
 
 install-dep:
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
@@ -255,12 +268,12 @@ endif
 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
+	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
-	@sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)
+	@sudo -E zypper refresh
+	@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else
-	$(error "This option currently works only on Ubuntu, Debian or Centos systems")
+	$(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
 endif
 
 define make
@@ -298,26 +311,26 @@ dist:
 	@$(RM) $(BR)/vpp-latest.tar.xz
 	@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
-build: $(BR)/.bootstrap.ok
+build: $(BR)/.deps.ok
 	$(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
 
 wipedist:
 	@$(RM) $(BR)/*.tar.xz
 
-wipe: wipedist $(BR)/.bootstrap.ok
+wipe: wipedist test-wipe $(BR)/.deps.ok
 	$(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
 
 rebuild: wipe build
 
-build-release: $(BR)/.bootstrap.ok
+build-release: $(BR)/.deps.ok
 	$(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
 
-wipe-release: $(BR)/.bootstrap.ok
+wipe-release: test-wipe $(BR)/.deps.ok
 	$(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
 
 rebuild-release: wipe-release build-release
 
-export VPP_PYTHON_PREFIX=$(BR)/python
+export VPP_PYTHON_PREFIX ?= $(BR)/python
 
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
@@ -333,20 +346,22 @@ define test
 	  LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
+	  OS_ID=$(OS_ID) \
+	  CACHE_OUTPUT=$(CACHE_OUTPUT) \
 	  $(3)
 endef
 
-test: bootstrap
+test:
 	$(call test,vpp,vpp,test)
 
-test-debug: bootstrap
+test-debug:
 	$(call test,vpp,vpp_debug,test)
 
-test-all: bootstrap
+test-all:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp,test)
 
-test-all-debug: bootstrap
+test-all-debug:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_debug,test)
 
@@ -356,19 +371,22 @@ test-help:
 test-wipe:
 	@make -C test wipe
 
-test-shell: bootstrap
+test-shell:
 	$(call test,vpp,vpp,shell)
 
-test-shell-debug: bootstrap
+test-shell-debug:
 	$(call test,vpp,vpp_debug,shell)
 
+test-dep:
+	@make -C test test-dep
+
 test-doc:
 	@make -C test doc
 
 test-wipe-doc:
 	@make -C test wipe-doc
 
-test-cov: bootstrap
+test-cov:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_gcov,cov)
 
@@ -486,7 +504,7 @@ define banner
 	@echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
+verify: install-dep $(BR)/.deps.ok dpdk-install-dev
 	$(call banner,"Building for PLATFORM=vpp using gcc")
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
@@ -498,10 +516,12 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
 	$(call banner,"Building sample-plugin")
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
+	$(call banner,"Building libmemif")
+	@make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
-	@make test
+	@make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif