X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=e99cafdd2162538b289a821457d1deb716ab9717;hb=74cac8839efae6a69baea031fb01602ef8907e8a;hp=06e15f0d4999676c88956aee30b2d63ae04aeb39;hpb=72d2c4f3718ba5293e9e0fa8726406ee7d9f3940;p=vpp.git diff --git a/Makefile b/Makefile index 06e15f0d499..e99cafdd216 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache GDB?=gdb PLATFORM?=vpp SAMPLE_PLUGIN?=no +STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) SUDO?=sudo @@ -53,7 +54,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -65,6 +66,7 @@ DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config 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 +DEB_DEPENDS += cmake ninja-build ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev @@ -75,7 +77,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9) DEB_DEPENDS += default-jdk-headless DEB_DEPENDS += libssl1.0-dev -else +else DEB_DEPENDS += default-jdk-headless DEB_DEPENDS += libssl-dev endif @@ -86,6 +88,7 @@ RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel +RPM_DEPENDS += cmake3 ninja-build ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) RPM_DEPENDS += subunit subunit-devel @@ -105,6 +108,7 @@ else RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python-ply RPM_DEPENDS += python-virtualenv + RPM_DEPENDS += devtoolset-7 RPM_DEPENDS_GROUPS = 'Development Tools' endif @@ -113,8 +117,9 @@ endif RPM_DEPENDS += chrpath libffi-devel rpm-build SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) +SUSE_ID= $(shell grep '^VERSION_ID=' /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_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja 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 @@ -125,12 +130,23 @@ 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) +ifeq ($(SUSE_NAME),Tumbleweed) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv +endif +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv +else RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6 RPM_SUSE_PYTHON_DEPS += python-virtualenv -else - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc - RPM_SUSE_PYTHON_DEPS += python2-virtualenv +endif +endif + +ifeq ($(OS_ID),opensuse-leap) +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv endif endif @@ -175,6 +191,7 @@ help: @echo " test-debug - build and run (basic) functional tests (debug build)" @echo " test-all - build and run (all) functional tests" @echo " test-all-debug - build and run (all) functional tests (debug build)" + @echo " test-ext - build and run 'extras' functional tests" @echo " test-shell - enter shell with test environment" @echo " test-shell-debug - enter shell with test environment (debug build)" @echo " test-wipe - wipe files generated by unit tests" @@ -270,8 +287,15 @@ endif @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) centos-release-scl-rh @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib +else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) +else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) @@ -364,6 +388,11 @@ test-all: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp,test) +test-ext: + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,) + $(eval EXTENDED_TESTS=yes) + $(call test,vpp,vpp_debug,test-ext) + test-all-debug: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) @@ -405,7 +434,6 @@ retest: retest-debug: $(call test,vpp,vpp_debug,retest) -STARTUP_DIR ?= $(PWD) ifeq ("$(wildcard $(STARTUP_CONF))","") define run @echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @@ -436,7 +464,7 @@ run-release: debug: $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args) -build-coverity: +build-coverity: $(call make,$(PLATFORM)_coverity,install-packages) debug-release: @@ -508,20 +536,18 @@ endef 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) - $(call banner,"Installing dependencies") - @sudo -E apt-get update - @sudo -E apt-get $(CONFIRM) $(FORCE) install clang - $(call banner,"Building for PLATFORM=vpp using clang") - @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages -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 JAPI") + @make -C build-root PLATFORM=vpp TAG=vpp japi-install + $(call banner,"Building VOM") + @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) + $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif