Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NAT44: fix snat_get_worker_out2in_cb (VPP-1536)
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
23c5e49
..
015db52
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-204,6
+204,7
@@
help:
@echo " test-help - show help on test framework"
@echo " run-vat - run vpp-api-test tool"
@echo " pkg-deb - build DEB packages"
@echo " test-help - show help on test framework"
@echo " run-vat - run vpp-api-test tool"
@echo " pkg-deb - build DEB packages"
+ @echo " vom-pkg-deb - build vom DEB packages"
@echo " pkg-rpm - build RPM packages"
@echo " install-ext-deps - install external development dependencies"
@echo " ctags - (re)generate ctags database"
@echo " pkg-rpm - build RPM packages"
@echo " install-ext-deps - install external development dependencies"
@echo " ctags - (re)generate ctags database"
@@
-295,6
+296,9
@@
endif
else ifneq ("$(wildcard /etc/redhat-release)","")
ifeq ($(OS_ID),rhel)
@sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
else ifneq ("$(wildcard /etc/redhat-release)","")
ifeq ($(OS_ID),rhel)
@sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
+ @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+ @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
+ @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
else ifeq ($(OS_ID),centos)
@sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
else ifeq ($(OS_ID),centos)
@sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@@
-431,6
+435,7
@@
test-wipe-doc:
@make -C test wipe-doc
test-cov:
@make -C test wipe-doc
test-cov:
+ @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
@@
-491,9
+496,17
@@
run-vat:
pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
+vom-pkg-deb:
+ $(call make,$(PLATFORM),vpp-package-deb)
+ $(call make,$(PLATFORM),vom-package-deb)
+
pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
+vom-pkg-deb-debug:
+ $(call make,$(PLATFORM)_debug,vpp-package-deb)
+ $(call make,$(PLATFORM)_debug,vom-package-deb)
+
pkg-rpm: dist
make -C extras/rpm
pkg-rpm: dist
make -C extras/rpm