[checkmk-commits] Revert "Fix daily build"

Module: check_mk Branch: master Commit: c25f1e0f6fa9db0144ef66e9f2bb6644171de956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25f1e0f6fa9db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 12 13:36:31 2019 +0100 Revert "Fix daily build" This reverts commit cf5d78f341cee81fb5ee5bdc10506c3a6dfdcf30. --- docker/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 64f8f82..dd52782 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -49,16 +49,8 @@ setup: setversion: sed -i 's/^ARG CMK_VERSION=.*$$/ARG CMK_VERSION="$(NEW_VERSION)"/g' Dockerfile -# When executed by tests/docker/test_docker.py the update test creates a -# 1.5.0 container which needs the distro file from the 1.5.0 branch. In -# other build cases (e.g. during daily builds) we only have a source tar -# and no git repository. In this case simply use the available distro file. distro-%.mk: - if [ -d ../.git ]; then \ - git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ ; \ - else \ - cp ../omd/distros/DEBIAN_9.mk $@ ; \ - fi + git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ needed-packages-%: distro-%.mk echo -e '$@:\n\t@echo \$$(OS_PACKAGES) > $@\n' | \