X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=0ea903c3d8f1691a2951137d3a8e7c6e55f18b64;hb=4b9669dc116f6c9be5ef124e4aff7b201404b6ea;hp=7c584f67660fd3fe1923b3f9c89eea28107bba78;hpb=28cf3b7da279c0755f6dc345c0973d1e3017e9ca;p=vpp.git diff --git a/Makefile b/Makefile index 7c584f67660..0ea903c3d8f 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ 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 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 +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 @@ -86,6 +86,7 @@ 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 @@ -113,7 +114,7 @@ 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 +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 @@ -147,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 @@ -155,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 " @@ -224,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 @@ -248,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)) @@ -282,7 +268,7 @@ endif 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 refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) @@ -325,21 +311,21 @@ 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 test-wipe $(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: test-wipe $(BR)/.bootstrap.ok +wipe-release: test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS))) rebuild-release: wipe-release build-release @@ -365,17 +351,17 @@ define test $(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) @@ -385,10 +371,10 @@ 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-doc: @@ -397,7 +383,7 @@ 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) @@ -515,7 +501,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)