From 947fe5e8af14fbfde7b2ddd6d59cfa3861d02d0d Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Thu, 26 Apr 2018 17:13:17 -0600 Subject: [PATCH] Makefile: Add new opensuse-leap os id Newer opensuse no longer reports in /etc/os-release as opensuse. It refers to itself as opensuse-leap. I imagine they think that sounds cooler or something. Change-Id: I12c721c7950101070dd8b58b627fb0e601cb8844 Signed-off-by: Ed Kern --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1eb1f0cef22..278aef35f99 100644 --- 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,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse opensuse-leap,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -139,6 +139,13 @@ else endif 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 +endif +endif + RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) @@ -280,6 +287,9 @@ else ifneq ("$(wildcard /etc/redhat-release)","") else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @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) else $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems") endif -- 2.16.6