Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Use correct enum type in ip_address_set
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5af0d57
..
0633ae1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,12
+14,13
@@
export WS_ROOT=$(CURDIR)
export BR=$(WS_ROOT)/build-root
CCACHE_DIR?=$(BR)/.ccache
export WS_ROOT=$(CURDIR)
export BR=$(WS_ROOT)/build-root
CCACHE_DIR?=$(BR)/.ccache
+SHELL:=/bin/bash
GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
STARTUP_DIR?=$(PWD)
MACHINE=$(shell uname -m)
GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
STARTUP_DIR?=$(PWD)
MACHINE=$(shell uname -m)
-SUDO?=sudo
+SUDO?=sudo
-E
DPDK_CONFIG?=no-pci
,:=,
DPDK_CONFIG?=no-pci
,:=,
@@
-64,7
+65,7
@@
endif
DEB_DEPENDS = curl build-essential autoconf automake ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS = curl build-essential autoconf automake ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf
indent clang-format
libnuma-dev
+DEB_DEPENDS += lcov chrpath autoconf libnuma-dev
DEB_DEPENDS += python3-all python3-setuptools check
DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
DEB_DEPENDS += python3-all python3-setuptools check
DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
@@
-72,17
+73,24
@@
DEB_DEPENDS += python3-venv # ensurepip
DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil
# python3.6 on 16.04 requires python36-dev
DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil
# python3.6 on 16.04 requires python36-dev
-LIBFFI=libffi6 # works on all but 20.04
+LIBFFI=libffi6 # works on all but 20.04
and debian-testing
ifeq ($(OS_VERSION_ID),18.04)
DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
DEB_DEPENDS += libssl-dev
ifeq ($(OS_VERSION_ID),18.04)
DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
DEB_DEPENDS += libssl-dev
- DEB_DEPENDS += clang-9
+ DEB_DEPENDS += clang-9
clang-format-10
else ifeq ($(OS_VERSION_ID),20.04)
DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
else ifeq ($(OS_VERSION_ID),20.04)
DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+ DEB_DEPENDS += clang-format-10
LIBFFI=libffi7
LIBFFI=libffi7
+else ifeq ($(OS_VERSION_ID),20.10)
+ DEB_DEPENDS += python3-virtualenv
+ DEB_DEPENDS += libssl-dev
+ DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+ DEB_DEPENDS += clang-format-10
+ LIBFFI=libffi8ubuntu1
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
DEB_DEPENDS += libssl1.0-dev
DEB_DEPENDS += python-all python-pip
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
DEB_DEPENDS += libssl1.0-dev
DEB_DEPENDS += python-all python-pip
@@
-92,6
+100,8
@@
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
else
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
else
DEB_DEPENDS += libssl-dev
+ DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+ LIBFFI=libffi7
endif
DEB_DEPENDS += $(LIBFFI)
endif
DEB_DEPENDS += $(LIBFFI)
@@
-120,7
+130,7
@@
ifeq ($(OS_ID),fedora)
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
RPM_DEPENDS += yum-utils
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
RPM_DEPENDS += yum-utils
- RPM_DEPENDS += compat-openssl10
+ RPM_DEPENDS += compat-openssl10
openssl-devel
RPM_DEPENDS += python2-devel python36-devel python3-ply
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
RPM_DEPENDS += python2-devel python36-devel python3-ply
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
@@
-189,8
+199,6
@@
help:
@echo " pkg-deb-debug - build DEB debug packages"
@echo " pkg-snap - build SNAP package"
@echo " snap-clean - clean up snap build environment"
@echo " pkg-deb-debug - build DEB debug packages"
@echo " pkg-snap - build SNAP package"
@echo " snap-clean - clean up snap build environment"
- @echo " vom-pkg-deb - build vom DEB packages"
- @echo " vom-pkg-deb-debug - build vom DEB debug packages"
@echo " pkg-rpm - build RPM packages"
@echo " install-ext-dep[s] - install external development dependencies"
@echo " ctags - (re)generate ctags database"
@echo " pkg-rpm - build RPM packages"
@echo " install-ext-dep[s] - install external development dependencies"
@echo " ctags - (re)generate ctags database"
@@
-283,8
+291,9
@@
ifeq ($(OS_ID),rhel)
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
- @sudo -E dnf install $(CONFIRM) epel-release
- @sudo -E dnf config-manager --set-enabled PowerTools
+ @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release
+ @sudo -E dnf config-manager --set-enabled \
+ $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1)
@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
else ifeq ($(OS_ID),centos)
@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
else ifeq ($(OS_ID),centos)
@@
-405,13
+414,11
@@
test-gcov:
.PHONY: test-all
test-all:
.PHONY: test-all
test-all:
- $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp,test)
.PHONY: test-all-debug
test-all-debug:
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp,test)
.PHONY: test-all-debug
test-all-debug:
- $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test)
@@
-457,7
+464,6
@@
test-wipe-doc:
.PHONY: test-cov
test-cov:
.PHONY: test-cov
test-cov:
- @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
@@
-510,7
+516,7
@@
endef
endif
%.files: .FORCE
endif
%.files: .FORCE
- @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' \) -and \
+ @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex'
-o -name '*\.py'
\) -and \
\( -not -path './build-root*' -o -path \
'./build-root/build-vpp_debug-native/dpdk*' \) > $@
\( -not -path './build-root*' -o -path \
'./build-root/build-vpp_debug-native/dpdk*' \) > $@
@@
-562,18
+568,10
@@
snap-clean:
snapcraft clean ; \
rm -f *.snap *.tgz
snapcraft clean ; \
rm -f *.snap *.tgz
-.PHONY: vom-pkg-deb
-vom-pkg-deb: pkg-deb
- $(call make,$(PLATFORM),vom-package-deb)
-
.PHONY: pkg-deb-debug
pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
.PHONY: pkg-deb-debug
pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
-.PHONY: vom-pkg-deb-debug
-vom-pkg-deb-debug: pkg-deb-debug
- $(call make,$(PLATFORM)_debug,vom-package-deb)
-
.PHONY: pkg-rpm
pkg-rpm: dist
make -C extras/rpm
.PHONY: pkg-rpm
pkg-rpm: dist
make -C extras/rpm
@@
-604,7
+602,7
@@
json-api-files-debug:
.PHONY: ctags
ctags: ctags.files
.PHONY: ctags
ctags: ctags.files
- @ctags --totals --tag-relative -L $<
+ @ctags --totals --tag-relative
=yes
-L $<
@rm $<
.PHONY: gtags
@rm $<
.PHONY: gtags
@@
-617,11
+615,16
@@
cscope: cscope.files
.PHONY: compdb
compdb:
.PHONY: compdb
compdb:
- @ninja -C build-root/build-vpp_debug-native/vpp -t compdb > compile_commands.json
+ @ninja -C build-root/build-vpp_debug-native/vpp build.ninja
+ @ninja -C build-root/build-vpp_debug-native/vpp -t compdb | \
+ extras/scripts/compdb_cleanup.py > compile_commands.json
.PHONY: checkstyle
checkstyle: checkfeaturelist
.PHONY: checkstyle
checkstyle: checkfeaturelist
- @build-root/scripts/checkstyle.sh
+ifeq ($(shell which clang-format-10),)
+ @sudo apt-get install -y clang-format-10
+endif
+ @extras/scripts/checkstyle.sh
.PHONY: checkstyle-commit
checkstyle-commit:
.PHONY: checkstyle-commit
checkstyle-commit:
@@
-635,7
+638,7
@@
checkstyle-all: checkstyle-commit checkstyle checkstyle-test
.PHONY: fixstyle
fixstyle:
.PHONY: fixstyle
fixstyle:
- @
build-root
/scripts/checkstyle.sh --fix
+ @
extras
/scripts/checkstyle.sh --fix
.PHONY: checkstyle-api
checkstyle-api:
.PHONY: checkstyle-api
checkstyle-api:
@@
-646,9
+649,6
@@
checkstyle-api:
# https://bugzilla.redhat.com/show_bug.cgi?id=1696324
.PHONY: centos-pyyaml
centos-pyyaml:
# https://bugzilla.redhat.com/show_bug.cgi?id=1696324
.PHONY: centos-pyyaml
centos-pyyaml:
-ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-7)
- @python3 -m pip install pyyaml
-endif
ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
@sudo -E yum install $(CONFIRM) python3-pyyaml
endif
ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
@sudo -E yum install $(CONFIRM) python3-pyyaml
endif
@@
-710,14
+710,8
@@
pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps
@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
@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)
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
-ifeq ($(OS_ID),ubuntu)
- $(call banner,"Building VOM $(PKG) package")
- @make vom-pkg-deb
-endif
MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
.PHONY: verify
MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
.PHONY: verify