GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
-export AESNI?=y
+MACHINE=$(shell uname -m)
+SUDO?=sudo
,:=,
define disable_plugins
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,$(OS_ID)),$(OS_ID))
PKG=rpm
endif
# +libganglia1-dev if building the gmond plugin
-DEB_DEPENDS = curl build-essential autoconf automake bison 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 libnuma-dev
+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
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
-RPM_DEPENDS += check
+RPM_DEPENDS += check check-devel
+RPM_DEPENDS += boost boost-devel
+RPM_DEPENDS += selinux-policy selinux-policy-devel
+
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+ RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel
- RPM_DEPENDS += python-devel
+ RPM_DEPENDS += python-devel python2-ply
RPM_DEPENDS += python2-virtualenv
+ RPM_DEPENDS += mbedtls-devel
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 += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel
- RPM_DEPENDS += python2-devel
+ RPM_DEPENDS += python2-devel python2-ply
RPM_DEPENDS += python2-virtualenv
+ RPM_DEPENDS += mbedtls-devel
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else
RPM_DEPENDS += openssl-devel
- RPM_DEPENDS += python-devel
+ RPM_DEPENDS += python-devel python-ply
RPM_DEPENDS += python-virtualenv
RPM_DEPENDS_GROUPS = 'Development Tools'
endif
# +ganglia-devel if building the ganglia plugin
RPM_DEPENDS += chrpath libffi-devel rpm-build
-ifeq ($(OS_ID),fedora)
- RPM_DEPENDS += nasm
-else ifeq ($(findstring y,$(AESNI)),y)
- RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+
+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_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)
+ifeq ($(SUSE_NAME),Tumbleweed)
+ RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+ RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+endif
+ifeq ($(SUSE_ID),15.0)
+ RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
+ RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+else
+ RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+ RPM_SUSE_PYTHON_DEPS += python-virtualenv
+endif
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 make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
+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-virtualenv
+endif
+endif
+
+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
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
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 "
@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
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))
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo -E yum install $(CONFIRM) $(RPM_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 ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
+ @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
@$(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)))
define test
- $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+ $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install vom-install,)
$(eval libs:=lib lib64)
make -C test \
TEST_DIR=$(WS_ROOT)/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)
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)
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
@cd $(STARTUP_DIR) && \
- sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \
- plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
+ $(SUDO) $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF)
endef
else
define run
@cd $(STARTUP_DIR) && \
- sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \
- plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
+ $(SUDO) $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//')
endef
endif
$(call make,$(PLATFORM)_debug,vpp-api-test-install)
run-vat:
- @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
+ @$(SUDO) $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
pkg-deb:
$(call make,$(PLATFORM),install-deb)
@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)
- $(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 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)
- @make COMPRESS_FAILED_TEST_LOGS=yes test
+ @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
endif
Code Review / vpp.git / blobdiff