Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bond: ping fails between l2 BD [VPP-1238]
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
77919d7
..
ac4c39b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-18,6
+18,7
@@
GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
MACHINE=$(shell uname -m)
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
MACHINE=$(shell uname -m)
+SUDO?=sudo
,:=,
define disable_plugins
,:=,
define disable_plugins
@@
-84,19
+85,21
@@
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check check-devel
RPM_DEPENDS += boost boost-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 += selinux-policy selinux-policy-devel
-RPM_DEPENDS += mbedtls-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+ RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel python2-ply
RPM_DEPENDS += python2-virtualenv
RPM_DEPENDS += openssl-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_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 python2-ply
RPM_DEPENDS += python2-virtualenv
RPM_DEPENDS += compat-openssl10-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_GROUPS = 'C Development Tools and Libraries'
else
RPM_DEPENDS += openssl-devel
@@
-110,6
+113,7
@@
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)
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 = autoconf automake ccache check-devel chrpath
RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply
@@
-122,13
+126,17
@@
RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
ifeq ($(OS_ID),opensuse)
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
+ifeq ($(SUSE_NAME),Tumbleweed)
RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
RPM_SUSE_PYTHON_DEPS += python2-virtualenv
endif
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 += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
endif
RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
@@
-148,7
+156,7
@@
ifneq ($(SAMPLE_PLUGIN),no)
TARGETS += sample-plugin
endif
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
.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
@@
-156,7
+164,6
@@
endif
help:
@echo "Make Targets:"
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 " install-dep - install software dependencies"
@echo " wipe - wipe all products of debug build "
@echo " wipe-release - wipe all products of release build "
@@
-225,7
+232,7
@@
help:
@echo " SAMPLE_PLUGIN = $(SAMPLE_PLUGIN)"
@echo " DISABLED_PLUGINS = $(DISABLED_PLUGINS)"
@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
ifeq ($(findstring y,$(UNATTENDED)),y)
make install-dep
endif
@@
-251,7
+258,8
@@
else ifneq ("$(wildcard /etc/redhat-release)","")
endif
@touch $@
endif
@touch $@
-bootstrap: $(BR)/.bootstrap.ok
+bootstrap:
+ @echo "'make bootstrap' is not needed anymore"
install-dep:
ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
install-dep:
ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
@@
-311,26
+319,26
@@
dist:
@$(RM) $(BR)/vpp-latest.tar.xz
@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
@$(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
$(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
$(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)))
$(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
$(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)))
libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
@@
-351,17
+359,17
@@
define test
$(3)
endef
$(3)
endef
-test:
bootstrap
+test:
$(call test,vpp,vpp,test)
$(call test,vpp,vpp,test)
-test-debug:
bootstrap
+test-debug:
$(call test,vpp,vpp_debug,test)
$(call test,vpp,vpp_debug,test)
-test-all:
bootstrap
+test-all:
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp,test)
$(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)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test)
@@
-371,19
+379,22
@@
test-help:
test-wipe:
@make -C test wipe
test-wipe:
@make -C test wipe
-test-shell:
bootstrap
+test-shell:
$(call test,vpp,vpp,shell)
$(call test,vpp,vpp,shell)
-test-shell-debug:
bootstrap
+test-shell-debug:
$(call test,vpp,vpp_debug,shell)
$(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-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)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
@@
-405,14
+416,12
@@
define run
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
@cd $(STARTUP_DIR) && \
@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) && \
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
endef
endif
@@
-442,7
+451,7
@@
build-vat:
$(call make,$(PLATFORM)_debug,vpp-api-test-install)
run-vat:
$(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)
pkg-deb:
$(call make,$(PLATFORM),install-deb)
@@
-501,7
+510,7
@@
define banner
@echo " "
endef
@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,"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)
@@
-513,6
+522,8
@@
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
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)
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)