[checkmk-commits] Check_MK Git: check_mk: Fixed building of MSI files on newer distros ( e.g. Ubuntu 15.04)

Module: check_mk Branch: master Commit: 7f263b4f046030cf970574c0bfaffd0240df0064 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f263b4f046030… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Jul 2 14:15:59 2015 +0200 Fixed building of MSI files on newer distros (e.g. Ubuntu 15.04) --- agents/windows/msibuild/.gitignore | 2 +- agents/windows/msibuild/Makefile | 4 ++-- agents/windows/msibuild/msibuild | 2 +- agents/windows/msibuild/msiinfo | 2 +- agents/windows/msibuild/msitools-0.93.tar.xz | Bin 613856 -> 0 bytes agents/windows/msibuild/msitools-0.94.tar.xz | Bin 0 -> 687288 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/windows/msibuild/.gitignore b/agents/windows/msibuild/.gitignore index b7bf4d1..f6418e0 100644 --- a/agents/windows/msibuild/.gitignore +++ b/agents/windows/msibuild/.gitignore @@ -1,2 +1,2 @@ -msitools-0.93 +msitools-0.94 check_mk_agent.msi diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index b451f5c..306be45 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -22,7 +22,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -MSITOOLS = msitools-0.93 +MSITOOLS = msitools-0.94 MSITOOLS_FILE = $(MSITOOLS).tar.xz BUILD_VERSION = 1 @@ -40,7 +40,7 @@ msibuild: tar -Jxf $(MSITOOLS_FILE) set -e ; for p in patches/*.dif ; do \ echo "applying $$p..." ; \ - patch -p0 -b < $$p ; \ + (cd $(MSITOOLS) ; patch -p1 -b < ../$$p) ; \ done cd $(MSITOOLS) && ./configure make -C $(MSITOOLS)/libmsi diff --git a/agents/windows/msibuild/msibuild b/agents/windows/msibuild/msibuild index ed1084e..b2bf096 120000 --- a/agents/windows/msibuild/msibuild +++ b/agents/windows/msibuild/msibuild @@ -1 +1 @@ -msitools-0.93/msibuild \ No newline at end of file +msitools-0.94/msibuild \ No newline at end of file diff --git a/agents/windows/msibuild/msiinfo b/agents/windows/msibuild/msiinfo index 79d1e8c..f9c3830 120000 --- a/agents/windows/msibuild/msiinfo +++ b/agents/windows/msibuild/msiinfo @@ -1 +1 @@ -msitools-0.93/msiinfo \ No newline at end of file +msitools-0.94/msiinfo \ No newline at end of file diff --git a/agents/windows/msibuild/msitools-0.93.tar.xz b/agents/windows/msibuild/msitools-0.93.tar.xz deleted file mode 100644 index 3107eaf..0000000 Binary files a/agents/windows/msibuild/msitools-0.93.tar.xz and /dev/null differ diff --git a/agents/windows/msibuild/msitools-0.94.tar.xz b/agents/windows/msibuild/msitools-0.94.tar.xz new file mode 100644 index 0000000..87f2f1c Binary files /dev/null and b/agents/windows/msibuild/msitools-0.94.tar.xz differ