Module: check_mk
Branch: master
Commit: 8d591cc6055ab77a10e07899e2479c2a86820410
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d591cc6055ab7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 12 13:22:37 2018 +0100
Prepare for building CMA 1.4+ packages
Change-Id: Ib7f214d1468f6256fa1b4ff1bb832a75a75450b8
---
omd/Makefile | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/omd/Makefile b/omd/Makefile
index 5677659..1935c8b 100644
--- a/omd/Makefile
+++ b/omd/Makefile
@@ -306,7 +306,12 @@ cma: check-edition
make PACKAGES="$(PACKAGES) cma" build pack
# Create info file to mark minimal cma firmware version requirement
- @echo -e "MIN_VERSION=1.1.2\n" >
$(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info
+ @if [ "$(DISTRO_CODE)" = "stretch" ]; then \
+ MIN_VERSION=1.4.0 ; \
+ else \
+ MIN_VERSION=1.1.2 ; \
+ fi ; \
+ echo -e "MIN_VERSION=$${MIN_VERSION}\n" >
$(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info
# Mark demo builds in cma.info file
@if [ -f packages/nagios/patches/9999-demo-version.dif ]; then \
@@ -314,11 +319,17 @@ cma: check-edition
fi
rm check-mk-$(EDITION)-bin-$(OMD_VERSION).tar.gz
+
+ if [ "$(DISTRO_CODE)" = "stretch" ]; then \
+ CMA_PKG_VERSION_TXT="-2" ; \
+ else \
+ CMA_PKG_VERSION_TXT="" ; \
+ fi ; \
PKG_VERSION=$(OMD_VERSION) ; \
PKG_VERSION=$${PKG_VERSION/.cee/} ; \
PKG_VERSION=$${PKG_VERSION/.cre/} ; \
PKG_VERSION=$${PKG_VERSION/.cme/} ; \
- tar czf $(REPO_PATH)/check-mk-$(EDITION)-$$PKG_VERSION-$$(uname -m).cma \
+ tar czf $(REPO_PATH)/check-mk-$(EDITION)-$${PKG_VERSION}$${CMA_PKG_VERSION_TXT}-$$(uname
-m).cma \
--owner=root \
--group=root \
-C $(DESTDIR)/opt/omd/versions/ \