Module: check_mk
Branch: master
Commit: 4f84625c06497877b8106025200a3ba1b2a1905d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f84625c064978…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jul 24 16:33:55 2018 +0200
Addition to werk 6340 (control.tar.xz was not deleted from package)
Change-Id: Ibf8720badf1ca2e847cdf1d438148b526bddf6e9
---
agents/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/agents/Makefile b/agents/Makefile
index 2e5a4ab..61b5d33 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -76,7 +76,7 @@ build:
packages: rpm deb
-rpm $(RPM_PACKAGE):
+rpm $(RPM_PACKAGE): waitmax
rm -rf $(RPM_TOPDIR)
mkdir -p $(RPM_TOPDIR)/RPMS
mkdir -p $(RPM_TOPDIR)/SRPMS
@@ -123,9 +123,9 @@ deb $(DEB_PACKAGE): $(RPM_PACKAGE)
tar czf control.tar.gz $(TAROPTS) -C ctrl . && \
xz --decompress data.tar.xz && \
gzip data.tar && \
- ar d ../$(DEB_PACKAGE) data.tar.xz && \
+ ar d ../$(DEB_PACKAGE) data.tar.xz control.tar.xz && \
ar r ../$(DEB_PACKAGE) debian-binary control.tar.gz data.tar.gz
rm -rf deb-unpack
clean:
- rm -rf *~ waitmax
+ rm -rf *~ waitmax *.rpm *.deb