[checkmk-commits] Fix chroot msi build and umount at end of do-chroot

Module: check_mk Branch: master Commit: 482457b3121d543d1a56ddd9613ec02df6eac401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482457b3121d54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 12:03:15 2017 +0200 Fix chroot msi build and umount at end of do-chroot Change-Id: Ifc36f6d167cdbc7099a59e9b78458407d3a7256b --- agents/windows/do-chroot | 3 ++- agents/windows/msibuild/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index f6527fb..35ac818 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -49,8 +49,9 @@ else fi umount $CHROOT_PATH/$CHROOT_BUILD_DIR + umount $CHROOT_PATH/dev/pts -sleep 2 +sleep 4 umount $CHROOT_PATH/dev umount $CHROOT_PATH/proc diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index ed4b2fe..053dc48 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -52,5 +52,6 @@ msibuild: exchange_msi_files: msibuild mkdir -p work sources cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources - ./msi-update -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) + LD_LIBRARY_PATH=$$(pwd)/msitools-0.94/libmsi/.libs \ + ./msi-update -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) rm -rf work sources