Cleanup of handoff code

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 1c6fafa..afbe6f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
 SUDO?=sudo
 
@@ -53,7 +54,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
 
@@ -75,7 +76,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
        DEB_DEPENDS += default-jdk-headless
        DEB_DEPENDS += libssl1.0-dev
-else 
+else
        DEB_DEPENDS += default-jdk-headless
        DEB_DEPENDS += libssl-dev
 endif
@@ -128,11 +129,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 +143,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
 
@@ -420,7 +421,6 @@ retest:
 retest-debug:
        $(call test,vpp,vpp_debug,retest)
 
-STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@@ -451,7 +451,7 @@ run-release:
 debug:
        $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
-build-coverity: 
+build-coverity:
        $(call make,$(PLATFORM)_coverity,install-packages)
 
 debug-release: