Improve the "show version" command

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 278aef3..c1bc849 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos fedora opensuse opensuse-leap,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -128,11 +128,11 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
 ifeq ($(OS_ID),opensuse)
 ifeq ($(SUSE_NAME),Tumbleweed)
        RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
-       RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+       RPM_SUSE_PYTHON_DEPS += python2-ply 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
+       RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
 else
        RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
        RPM_SUSE_PYTHON_DEPS += python-virtualenv
@@ -142,7 +142,7 @@ endif
 ifeq ($(OS_ID),opensuse-leap)
 ifeq ($(SUSE_ID),15.0)
        RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
-       RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+       RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
 endif
 endif
 
@@ -353,7 +353,7 @@ export VPP_PYTHON_PREFIX ?= $(BR)/python
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
 define test
-       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install vom-install,)
        $(eval libs:=lib lib64)
        make -C test \
          TEST_DIR=$(WS_ROOT)/test \
@@ -527,6 +527,8 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev
        @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)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)