[checkmk-commits] Fix broken omd in daily build

Module: check_mk Branch: master Commit: fab385502453a3df473a878fbdeea791af104a35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab385502453a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 12 20:20:20 2018 +0200 Fix broken omd in daily build Change-Id: I66dedc260a5dee8627466764b0874282a0888d7f --- Makefile | 2 +- omd/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 114cdf4..8bd5f7d 100644 --- a/Makefile +++ b/Makefile @@ -288,13 +288,13 @@ version: if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi setversion: + $(MAKE) -C omd NEW_VERSION=$(NEW_VERSION) setversion sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" defines.make ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkbackup ; \ sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' cmk/__init__.py bin/mkbench bin/livedump; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion - $(MAKE) -C omd NEW_VERSION=$(NEW_VERSION) setversion $(MAKE) -C docker NEW_VERSION=$(NEW_VERSION) setversion ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise NEW_VERSION=$(NEW_VERSION) setversion diff --git a/omd/Makefile b/omd/Makefile index f5e52e7..e4204db 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -290,8 +290,8 @@ setversion: NEW_OMD_VERSION=$(NEW_VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) ; \ if [ -n "$$NEW_OMD_VERSION" ] && [ "$$NEW_OMD_VERSION" != "$(OMD_VERSION)" ]; then \ sed -ri 's/^(OMD_SERIAL[[:space:]]*= *).*/\1'"$(NEW_SERIAL)/" Makefile.omd ; \ - sed -ri 's/^(OMD_VERSION[[:space:]]*= *).*/\1"'"$$NEW_OMD_VERSION"'"/' packages/omd/omd ; \ - fi + fi ; \ + sed -ri 's/^(OMD_VERSION[[:space:]]*= *).*/\1"'"$$NEW_OMD_VERSION"'"/' packages/omd/omd test: t/test_all.sh