X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=bbbb2acfb7fb707e7ae23df8a355128f673a2332;hb=5a8123bda0261158457e38bfb4922aa5961389ff;hp=71eec082aee1d913568fda152f599a69d3cf516e;hpb=2ce7f9834ab55728520bff0dd15f8d82c10b95a0;p=vpp.git

diff --git a/Makefile b/Makefile
index 71eec082aee..bbbb2acfb7f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 endif
 
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(OS_ID),centos)
+else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -75,6 +75,7 @@ help:
 	@echo " wipe-release        - wipe all products of release build "
 	@echo " build               - build debug binaries"
 	@echo " build-release       - build release binaries"
+	@echo " build-coverity      - build coverity artifacts"
 	@echo " rebuild             - wipe and build debug binares"
 	@echo " rebuild-release     - wipe and build release binares"
 	@echo " run                 - run debug binary"
@@ -114,7 +115,7 @@ help:
 	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
-	@echo " TEST=<name>         - only run specific test"
+	@echo " TEST=<filter>       - apply filter to test set, see test-help"
 	@echo ""
 	@echo "Current Argument Values:"
 	@echo " V            = $(V)"
@@ -161,8 +162,8 @@ ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
 	@sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
-	@sudo -E apt-get update
 endif
+	@sudo -E apt-get update
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@@ -287,6 +288,9 @@ run-release:
 debug:
 	$(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
+build-coverity: 
+	$(call make,$(PLATFORM)_coverity,install-packages)
+
 debug-release:
 	$(call run, $(BR)/install-$(PLATFORM)-native,$(GDB) $(GDB_ARGS) --args)