From: Marco Varlese <marco.varlese@suse.com>
Date: Fri, 22 Sep 2017 15:53:53 +0000 (+0200)
Subject: openSUSE build fix
X-Git-Tag: v17.10-rc1~29
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=dc33d4ccb3712ab313f9d471cde35ef208aa0e29;p=vpp.git

openSUSE build fix

* Fixed package dependency
* Fixed bash unary operation error

Change-Id: I782dda8ffd807931241fa6034c110f5fedbeca8e
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---

diff --git a/Makefile b/Makefile
index b8aca4706f6..cc26ea52ffe 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ else ifeq ($(findstring y,$(AESNI)),y)
 endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
-RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
+RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
 RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
 
 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh
index 34873f96eae..fcfd52aa707 100755
--- a/extras/vagrant/build.sh
+++ b/extras/vagrant/build.sh
@@ -72,12 +72,14 @@ fi
 # Build and install packaging
 $SUDOCMD make bootstrap
 
-if [ $DISTRIB_ID == "Ubuntu" ]; then
+if [ "$DISTRIB_ID" == "Ubuntu" ]; then
     $SUDOCMD make pkg-deb
-elif [ $DISTRIB_ID == "debian" ]; then
+elif [ "$DISTRIB_ID" == "debian" ]; then
     $SUDOCMD make pkg-deb
-elif [ $DISTRIB_ID == "CentOS" ]; then
+elif [ "$DISTRIB_ID" == "CentOS" ]; then
     (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
     $SUDOCMD make pkg-rpm
+elif [ "$DISTRIB_ID" == "opensuse" ]; then
+    $SUDOCMD make build-release
 fi