install-dep: force osleap boost dep install

Triple commit this patch to stable/1807. Manually created it due to merge
conflict from cherrypicking the original patch 16631. This patch differs from
16631 that it skips the second chunk from the original patch, listed below,
because it has no significance which is also the source of the merge conflict.

@@ -309,7 +309,7 @@
 	@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
 	@sudo -E zypper refresh
-	@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+	@sudo -E zypper install  -y $(RPM_SUSE_DEPENDS)
 else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
 	@sudo -E zypper refresh
 	@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)

This patch is needed for stable/1807 because verify job failed for
https://gerrit.fd.io/r/#/c/17031/

Change-Id: Iab863ab57738179ec59d6cd088cc83354acada08
Signed-off-by: Steven Luong <[email protected]>

diff --git a/Makefile b/Makefile
index c1bc849..f6b0f79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -127,14 +127,14 @@ 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_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0  libboost_thread1_68_0-devel-1.68.0 gcc
        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_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0  libboost_thread1_68_0-devel-1.68.0 gcc6
        RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
 else
-       RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+       RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6
        RPM_SUSE_PYTHON_DEPS += python-virtualenv
 endif
 endif