[checkmk-commits] chroot builds: Fixed paths of chroots

Module: check_mk Branch: master Commit: 900b3f6afbd0f436f8edbb5880cd0c7a665ee458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900b3f6afbd0f4… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Oct 24 16:19:51 2017 +0200 chroot builds: Fixed paths of chroots Change-Id: I7c12085937de6a919245324de66db5b535afacac --- agents/windows/make-agent | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 8567303..372efe4 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -22,6 +22,7 @@ chroot_dependencies=(debootstrap debian-archive-keyring) versionfile=chroot_version base="$(realpath ../..)" +base_rel_dir=agents/windows # May be set from external environment. Otherwise use chroot # directory in agents/windows @@ -39,8 +40,9 @@ fi # elements to make # a) different namespaces possible for (windows agent, agent updater) # b) parallel builds of different chroot versions possible +CHROOT_VERSION=$(<$base/agents/windows/$versionfile) CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} -export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION +export CHROOT_PATH=$CHROOT_BASE_PATH/$CHROOT_NAME/$CHROOT_VERSION echo "CHROOT_PATH is $CHROOT_PATH"